diff options
13 files changed, 117 insertions, 118 deletions
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 5eae6d3e43fe..02b7667dc820 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -631,9 +631,9 @@ flag { } flag { - name: "status_bar_simple_fragment" + name: "status_bar_root_modernization" namespace: "systemui" - description: "Feature flag for refactoring the collapsed status bar fragment" + description: "Feature flag for replacing the status bar fragment with a compose root" bug: "364360986" } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarInitializerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarInitializerTest.kt index 938da88a8819..009b33b9f808 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarInitializerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarInitializerTest.kt @@ -23,7 +23,6 @@ import android.platform.test.annotations.EnableFlags import android.view.ViewGroup import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.fragments.FragmentHostManager import com.android.systemui.kosmos.useUnconfinedTestDispatcher @@ -81,21 +80,21 @@ class StatusBarInitializerTest : SysuiTestCase() { ) @Test - @EnableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT) - fun simpleFragment_startsFromCoreStartable() { + @EnableFlags(StatusBarRootModernization.FLAG_NAME) + fun flagOn_startsFromCoreStartable() { underTest.start() assertThat(underTest.initialized).isTrue() } @Test - @EnableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT) - fun simpleFragment_throwsIfInitializeIsCalled() { + @EnableFlags(StatusBarRootModernization.FLAG_NAME) + fun flagOn_throwsIfInitializeIsCalled() { assertThrows(IllegalStateException::class.java) { underTest.initializeStatusBar() } } @Test - @EnableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT) - fun simpleFragment_flagEnabled_doesNotCreateFragment() { + @EnableFlags(StatusBarRootModernization.FLAG_NAME) + fun flagOn_flagEnabled_doesNotCreateFragment() { underTest.start() verify(fragmentManager, never()).beginTransaction() @@ -103,14 +102,14 @@ class StatusBarInitializerTest : SysuiTestCase() { } @Test - @DisableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) fun flagOff_startCalled_stillInitializes() { underTest.start() assertThat(underTest.initialized).isTrue() } @Test - @DisableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) fun flagOff_doesNotThrowIfInitializeIsCalled() { underTest.initializeStatusBar() assertThat(underTest.initialized).isTrue() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt b/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt index f441fd644c17..4c54fc49e536 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt @@ -112,12 +112,12 @@ constructor( } override fun initializeStatusBar() { - StatusBarSimpleFragment.assertInLegacyMode() + StatusBarRootModernization.assertInLegacyMode() doStart() } private fun doStart() { - if (StatusBarSimpleFragment.isEnabled) doComposeStart() else doLegacyStart() + if (StatusBarRootModernization.isEnabled) doComposeStart() else doLegacyStart() } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarSimpleFragment.kt b/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt index 214151383dc6..057213fa4b18 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarSimpleFragment.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarRootModernization.kt @@ -21,9 +21,9 @@ import com.android.systemui.flags.FlagToken import com.android.systemui.flags.RefactorFlagUtils /** Helper for reading and using the status bar simple fragment flag state */ -object StatusBarSimpleFragment { +object StatusBarRootModernization { /** Aconfig flag for removing the fragment */ - const val FLAG_NAME = Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT + const val FLAG_NAME = Flags.FLAG_STATUS_BAR_ROOT_MODERNIZATION /** A token used for dependency declaration */ val token: FlagToken @@ -32,7 +32,7 @@ object StatusBarSimpleFragment { /** Is the refactor enabled */ @JvmStatic inline val isEnabled - get() = Flags.statusBarSimpleFragment() + get() = Flags.statusBarRootModernization() /** * Called to ensure code is only run when the flag is enabled. This protects users from the diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 7389086296a3..80c8e8b2a109 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -203,7 +203,7 @@ import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.SysuiStatusBarStateController; import com.android.systemui.statusbar.core.StatusBarConnectedDisplays; import com.android.systemui.statusbar.core.StatusBarInitializer; -import com.android.systemui.statusbar.core.StatusBarSimpleFragment; +import com.android.systemui.statusbar.core.StatusBarRootModernization; import com.android.systemui.statusbar.data.model.StatusBarMode; import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore; import com.android.systemui.statusbar.notification.NotificationActivityStarter; @@ -1231,7 +1231,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { checkBarModes(); }); } - if (!StatusBarSimpleFragment.isEnabled() && !StatusBarConnectedDisplays.isEnabled()) { + if (!StatusBarRootModernization.isEnabled() && !StatusBarConnectedDisplays.isEnabled()) { // When the flag is on, we register the fragment as a core startable and this is not // needed mStatusBarInitializer.initializeStatusBar(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt index ba878edc1132..58386b0cad7c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.kt @@ -30,7 +30,7 @@ import com.android.systemui.statusbar.core.StatusBarInitializer import com.android.systemui.statusbar.core.StatusBarInitializerImpl import com.android.systemui.statusbar.core.StatusBarInitializerStore import com.android.systemui.statusbar.core.StatusBarOrchestrator -import com.android.systemui.statusbar.core.StatusBarSimpleFragment +import com.android.systemui.statusbar.core.StatusBarRootModernization import com.android.systemui.statusbar.data.repository.PrivacyDotViewControllerStoreModule import com.android.systemui.statusbar.data.repository.PrivacyDotWindowControllerStoreModule import com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore @@ -87,7 +87,7 @@ interface StatusBarPhoneModule { return if (StatusBarConnectedDisplays.isEnabled) { // Will be started through MultiDisplayStatusBarStarter CoreStartable.NOP - } else if (StatusBarSimpleFragment.isEnabled) { + } else if (StatusBarRootModernization.isEnabled) { defaultInitializerLazy.get() } else { // Will be started through CentralSurfaces diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java index 5cc44762dde8..c55a63c9edf5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java @@ -58,7 +58,7 @@ import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips; import com.android.systemui.statusbar.core.StatusBarConnectedDisplays; -import com.android.systemui.statusbar.core.StatusBarSimpleFragment; +import com.android.systemui.statusbar.core.StatusBarRootModernization; import com.android.systemui.statusbar.disableflags.DisableFlagsLogger; import com.android.systemui.statusbar.events.SystemStatusAnimationCallback; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; @@ -365,7 +365,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mPrimaryOngoingActivityChip = mStatusBar.findViewById(R.id.ongoing_activity_chip_primary); mSecondaryOngoingActivityChip = mStatusBar.findViewById(R.id.ongoing_activity_chip_secondary); - if (!StatusBarSimpleFragment.isEnabled()) { + if (!StatusBarRootModernization.isEnabled()) { showEndSideContent(false); showClock(false); } @@ -464,7 +464,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue super.onPause(); mCommandQueue.removeCallback(this); mStatusBarStateController.removeCallback(this); - if (!StatusBarSimpleFragment.isEnabled()) { + if (!StatusBarRootModernization.isEnabled()) { mOngoingCallController.removeCallback(mOngoingCallListener); } mAnimationScheduler.removeCallback(this); @@ -507,7 +507,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mNicBindingDisposable = mNicViewBinder.bindWhileAttached(notificationIcons, displayId); } - if (!StatusBarSimpleFragment.isEnabled()) { + if (!StatusBarRootModernization.isEnabled()) { updateNotificationIconAreaAndOngoingActivityChip(/* animate= */ false); } Trace.endSection(); @@ -528,7 +528,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue new StatusBarVisibilityChangeListener() { @Override public void onStatusBarVisibilityMaybeChanged() { - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { return; } updateStatusBarVisibilities(/* animate= */ true); @@ -536,7 +536,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue @Override public void onTransitionFromLockscreenToDreamStarted() { - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { return; } mTransitionFromLockscreenToDreamStarted = true; @@ -547,7 +547,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue boolean hasPrimaryOngoingActivity, boolean hasSecondaryOngoingActivity, boolean shouldAnimate) { - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { return; } mHasPrimaryOngoingActivity = hasPrimaryOngoingActivity; @@ -558,7 +558,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue @Override public void onIsHomeStatusBarAllowedBySceneChanged( boolean isHomeStatusBarAllowedByScene) { - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { return; } mHomeStatusBarAllowedByScene = isHomeStatusBarAllowedByScene; @@ -568,7 +568,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue @Override public void disable(int displayId, int state1, int state2, boolean animate) { - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { return; } if (displayId != getContext().getDisplayId()) { @@ -582,7 +582,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private void updateStatusBarVisibilities(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); StatusBarVisibilityModel previousModel = mLastModifiedVisibility; StatusBarVisibilityModel newModel = calculateInternalModel(mLastSystemVisibility); @@ -623,7 +623,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue private StatusBarVisibilityModel calculateInternalModel( StatusBarVisibilityModel externalModel) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); // TODO(b/328393714) use HeadsUpNotificationInteractor.showHeadsUpStatusBar instead. boolean headsUpVisible = @@ -677,7 +677,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue * mLastModifiedVisibility. */ private void updateNotificationIconAreaAndOngoingActivityChip(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); StatusBarVisibilityModel visibilityModel = mLastModifiedVisibility; boolean disableNotifications = !visibilityModel.getShowNotificationIcons(); @@ -714,7 +714,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private boolean shouldHideStatusBar() { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); boolean isDefaultDisplay = getContext().getDisplayId() == Display.DEFAULT_DISPLAY; boolean shouldHideForCurrentDisplay = @@ -776,7 +776,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private void hideEndSideContent(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); if (!animate || !mAnimationsEnabled) { mEndSideAlphaController.setAlpha(/*alpha*/ 0f, SOURCE_OTHER); } else { @@ -786,7 +786,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private void showEndSideContent(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); if (!animate || !mAnimationsEnabled) { mEndSideAlphaController.setAlpha(1f, SOURCE_OTHER); return; @@ -803,18 +803,18 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private void hideClock(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateHiddenState(mClockView, clockHiddenMode(), animate); } private void showClock(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateShow(mClockView, animate); } /** Hides the primary ongoing activity chip. */ private void hidePrimaryOngoingActivityChip(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateHiddenState(mPrimaryOngoingActivityChip, View.GONE, animate); } @@ -826,18 +826,18 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue * activities. See b/332662551. */ private void showPrimaryOngoingActivityChip(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateShow(mPrimaryOngoingActivityChip, animate); } private void hideSecondaryOngoingActivityChip(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateHiddenState(mSecondaryOngoingActivityChip, View.GONE, animate); } private void showSecondaryOngoingActivityChip(boolean animate) { StatusBarNotifChips.assertInNewMode(); - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateShow(mSecondaryOngoingActivityChip, animate); } @@ -846,7 +846,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue * don't set the clock GONE otherwise it'll mess up the animation. */ private int clockHiddenMode() { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); if (!mShadeExpansionStateManager.isClosed() && !mKeyguardStateController.isShowing() && !mStatusBarStateController.isDozing()) { return View.INVISIBLE; @@ -855,24 +855,24 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } public void hideNotificationIconArea(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateHide(mNotificationIconAreaInner, animate); } public void showNotificationIconArea(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateShow(mNotificationIconAreaInner, animate); } public void hideOperatorName(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); if (mOperatorNameViewController != null) { animateHide(mOperatorNameViewController.getView(), animate); } } public void showOperatorName(boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); if (mOperatorNameViewController != null) { animateShow(mOperatorNameViewController.getView(), animate); } @@ -882,7 +882,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue * Animate a view to INVISIBLE or GONE */ private void animateHiddenState(final View v, int state, boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); v.animate().cancel(); if (!animate || !mAnimationsEnabled) { v.setAlpha(0f); @@ -902,7 +902,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue * Hides a view. */ private void animateHide(final View v, boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); animateHiddenState(v, View.INVISIBLE, animate); } @@ -910,7 +910,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue * Shows a view, and synchronizes the animation with Keyguard exit animations, if applicable. */ private void animateShow(View v, boolean animate) { - StatusBarSimpleFragment.assertInLegacyMode(); + StatusBarRootModernization.assertInLegacyMode(); v.animate().cancel(); v.setVisibility(View.VISIBLE); if (!animate || !mAnimationsEnabled) { @@ -949,7 +949,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mOperatorNameViewController.init(); // This view should not be visible on lock-screen if (mKeyguardStateController.isShowing()) { - if (!StatusBarSimpleFragment.isEnabled()) { + if (!StatusBarRootModernization.isEnabled()) { hideOperatorName(false); } } @@ -957,7 +957,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue } private void initOngoingCallChip() { - if (!StatusBarSimpleFragment.isEnabled()) { + if (!StatusBarRootModernization.isEnabled()) { mOngoingCallController.addCallback(mOngoingCallListener); } // TODO(b/364653005): Do we also need to set the secondary activity chip? @@ -969,7 +969,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue @Override public void onDozingChanged(boolean isDozing) { - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { return; } updateStatusBarVisibilities(/* animate= */ false); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaController.kt index eaf15a8cbe17..e4929b574bd1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaController.kt @@ -20,7 +20,7 @@ import android.view.View import androidx.core.animation.Interpolator import androidx.core.animation.ValueAnimator import com.android.app.animation.InterpolatorsAndroidX -import com.android.systemui.statusbar.core.StatusBarSimpleFragment +import com.android.systemui.statusbar.core.StatusBarRootModernization /** * A controller that keeps track of multiple sources applying alpha value changes to a view. It will @@ -75,7 +75,7 @@ constructor(private val view: View, private val initialAlpha: Float = 1f) { private fun applyAlphaToView() { val minAlpha = getMinAlpha() - if (!StatusBarSimpleFragment.isEnabled) { + if (!StatusBarRootModernization.isEnabled) { view.visibility = if (minAlpha != 0f) View.VISIBLE else View.INVISIBLE view.alpha = minAlpha } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt index 11d73397ca22..2177e025b976 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/binder/HomeStatusBarViewBinder.kt @@ -22,6 +22,7 @@ import android.view.View import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import com.android.app.animation.Interpolators +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.Flags import com.android.systemui.dagger.SysUISingleton import com.android.systemui.lifecycle.repeatWhenAttached @@ -30,13 +31,12 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips import com.android.systemui.statusbar.chips.ui.binder.OngoingActivityChipBinder import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel -import com.android.systemui.statusbar.core.StatusBarSimpleFragment +import com.android.systemui.statusbar.core.StatusBarRootModernization import com.android.systemui.statusbar.notification.shared.NotificationsLiveDataStoreRefactor import com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel.VisibilityModel import javax.inject.Inject -import com.android.app.tracing.coroutines.launchTraced as launch /** * Interface to assist with binding the [CollapsedStatusBarFragment] to [HomeStatusBarViewModel]. @@ -91,7 +91,7 @@ class HomeStatusBarViewBinderImpl @Inject constructor() : HomeStatusBarViewBinde launch { viewModel.primaryOngoingActivityChip.collect { primaryChipModel -> OngoingActivityChipBinder.bind(primaryChipModel, primaryChipView) - if (StatusBarSimpleFragment.isEnabled) { + if (StatusBarRootModernization.isEnabled) { when (primaryChipModel) { is OngoingActivityChipModel.Shown -> primaryChipView.show(shouldAnimateChange = true) @@ -133,7 +133,7 @@ class HomeStatusBarViewBinderImpl @Inject constructor() : HomeStatusBarViewBinde // enough space for it. OngoingActivityChipBinder.bind(chips.secondary, secondaryChipView) - if (StatusBarSimpleFragment.isEnabled) { + if (StatusBarRootModernization.isEnabled) { primaryChipView.adjustVisibility(chips.primary.toVisibilityModel()) secondaryChipView.adjustVisibility( chips.secondary.toVisibilityModel() @@ -160,7 +160,7 @@ class HomeStatusBarViewBinderImpl @Inject constructor() : HomeStatusBarViewBinde } } - if (StatusBarSimpleFragment.isEnabled) { + if (StatusBarRootModernization.isEnabled) { val clockView = view.requireViewById<View>(R.id.clock) launch { viewModel.isClockVisible.collect { clockView.adjustVisibility(it) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt index 247abc3da175..a9c2f72f7b18 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt @@ -104,7 +104,7 @@ fun StatusBarRoot( darkIconDispatcher: DarkIconDispatcher, onViewCreated: (ViewGroup) -> Unit, ) { - // None of these methods are used when [StatusBarSimpleFragment] is on. + // None of these methods are used when [StatusBarRootModernization] is on. // This can be deleted once the fragment is gone val nopVisibilityChangeListener = object : StatusBarVisibilityChangeListener { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowView.java index 3f6ef16e2e5e..b79d39e65682 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowView.java @@ -35,7 +35,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.systemui.compose.ComposeInitializer; -import com.android.systemui.statusbar.core.StatusBarSimpleFragment; +import com.android.systemui.statusbar.core.StatusBarRootModernization; import com.android.systemui.statusbar.data.repository.StatusBarConfigurationController; /** @@ -64,7 +64,7 @@ public class StatusBarWindowView extends FrameLayout { public void onAttachedToWindow() { super.onAttachedToWindow(); - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { ComposeInitializer.INSTANCE.onAttachedToWindow(this); } } @@ -73,7 +73,7 @@ public class StatusBarWindowView extends FrameLayout { public void onDetachedFromWindow() { super.onDetachedFromWindow(); - if (StatusBarSimpleFragment.isEnabled()) { + if (StatusBarRootModernization.isEnabled()) { ComposeInitializer.INSTANCE.onDetachedFromWindow(this); } } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index 4b648a3e76e7..d1e4f646a382 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.phone.fragment; import static android.view.Display.DEFAULT_DISPLAY; import static com.android.systemui.Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS; -import static com.android.systemui.Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT; import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_CLOSED; import static com.android.systemui.shade.ShadeExpansionStateManagerKt.STATE_OPEN; @@ -61,6 +60,7 @@ import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.OperatorNameViewController; import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips; +import com.android.systemui.statusbar.core.StatusBarRootModernization; import com.android.systemui.statusbar.disableflags.DisableFlagsLogger; import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler; import com.android.systemui.statusbar.notification.icon.ui.viewbinder.NotificationIconContainerStatusBarViewBinder; @@ -156,7 +156,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testDisableNone() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -167,7 +167,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testDisableSystemInfo_systemAnimationIdle_doesHide() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -185,7 +185,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testSystemStatusAnimation_startedDisabled_finishedWithAnimator_showsSystemInfo() { // GIVEN the status bar hides the system info via disable flags, while there is no event CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -215,7 +215,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testSystemStatusAnimation_systemInfoDisabled_staysInvisible() { // GIVEN the status bar hides the system info via disable flags, while there is no event CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -232,7 +232,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testSystemStatusAnimation_notDisabled_animatesAlphaZero() { // GIVEN the status bar is not disabled CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -248,7 +248,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testSystemStatusAnimation_notDisabled_animatesBackToAlphaOne() { // GIVEN the status bar is not disabled CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -272,7 +272,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testDisableNotifications() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -290,7 +290,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @EnableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @EnableFlags(StatusBarRootModernization.FLAG_NAME) public void testDisableNotifications_doesNothingWhenFlagEnabled() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -308,7 +308,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testDisableClock() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -326,7 +326,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @EnableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @EnableFlags(StatusBarRootModernization.FLAG_NAME) public void testDisableClock_doesNothingWhenFlagEnabled() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -345,7 +345,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_shadeOpenAndShouldHide_everythingHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -363,7 +363,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_shadeOpenButNotShouldHide_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -382,7 +382,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { /** Regression test for b/279790651. */ @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_shadeOpenAndShouldHide_thenShadeNotOpenAndDozingUpdate_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -410,7 +410,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_notTransitioningToOccluded_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -426,7 +426,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_isTransitioningToOccluded_everythingHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -442,7 +442,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_wasTransitioningToOccluded_transitionFinished_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -473,7 +473,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void disable_noOngoingCall_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -485,7 +485,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void disable_hasOngoingCall_chipDisplayedAndNotificationIconsHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -498,7 +498,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void disable_hasOngoingCallButNotificationIconsDisabled_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -511,7 +511,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void disable_hasOngoingCallButAlsoHun_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -524,7 +524,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void disable_ongoingCallEnded_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -548,7 +548,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void disable_hasOngoingCall_hidesNotifsWithoutAnimation() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Enable animations for testing so that we can verify we still aren't animating @@ -565,7 +565,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) public void screenSharingChipsDisabled_ignoresNewCallback() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -599,7 +599,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void noOngoingActivity_chipHidden() { resumeAndGetFragment(); @@ -617,7 +617,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void hasPrimaryOngoingActivity_primaryChipDisplayedAndNotificationIconsHidden() { resumeAndGetFragment(); @@ -634,8 +634,8 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @EnableFlags({ FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME, - FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) - public void hasPrimaryOngoingActivity_viewsUnchangedWhenSimpleFragmentFlagOn() { + StatusBarRootModernization.FLAG_NAME}) + public void hasPrimaryOngoingActivity_viewsUnchangedWhenRootModernizationFlagOn() { resumeAndGetFragment(); assertEquals(View.VISIBLE, getPrimaryOngoingActivityChipView().getVisibility()); @@ -660,7 +660,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) public void hasSecondaryOngoingActivity_butNotifsFlagOff_secondaryChipHidden() { resumeAndGetFragment(); @@ -674,7 +674,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void hasSecondaryOngoingActivity_flagOn_secondaryChipShownAndNotificationIconsHidden() { resumeAndGetFragment(); @@ -689,7 +689,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) public void hasOngoingActivityButNotificationIconsDisabled_chipHidden_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -706,7 +706,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void hasOngoingActivitiesButNotificationIconsDisabled_chipsHidden_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -724,7 +724,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) public void hasOngoingActivityButAlsoHun_chipHidden_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -741,7 +741,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void hasOngoingActivitiesButAlsoHun_chipsHidden_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -759,7 +759,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) public void primaryOngoingActivityEnded_chipHidden_notifsFlagOff() { resumeAndGetFragment(); @@ -782,7 +782,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void primaryOngoingActivityEnded_chipHidden_notifsFlagOn() { resumeAndGetFragment(); @@ -805,7 +805,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void secondaryOngoingActivityEnded_chipHidden() { resumeAndGetFragment(); @@ -828,7 +828,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) public void hasOngoingActivity_hidesNotifsWithoutAnimation_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Enable animations for testing so that we can verify we still aren't animating @@ -847,7 +847,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void hasOngoingActivity_hidesNotifsWithoutAnimation_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Enable animations for testing so that we can verify we still aren't animating @@ -866,7 +866,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, FLAG_STATUS_BAR_SIMPLE_FRAGMENT}) + @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) public void screenSharingChipsEnabled_ignoresOngoingCallController_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -899,7 +899,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void screenSharingChipsEnabled_ignoresOngoingCallController_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -933,7 +933,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void isHomeStatusBarAllowedByScene_false_everythingHidden() { resumeAndGetFragment(); @@ -947,7 +947,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void isHomeStatusBarAllowedByScene_true_everythingShown() { resumeAndGetFragment(); @@ -961,7 +961,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_isHomeStatusBarAllowedBySceneFalse_disableValuesIgnored() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -979,7 +979,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @EnableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_isHomeStatusBarAllowedBySceneTrue_disableValuesUsed() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -997,7 +997,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void isHomeStatusBarAllowedByScene_sceneContainerDisabled_valueNotUsed() { resumeAndGetFragment(); @@ -1011,7 +1011,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_isDozing_clockAndSystemInfoVisible() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mStatusBarStateController.isDozing()).thenReturn(true); @@ -1023,7 +1023,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_NotDozing_clockAndSystemInfoVisible() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mStatusBarStateController.isDozing()).thenReturn(false); @@ -1035,7 +1035,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_headsUpShouldBeVisibleTrue_clockDisabled() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mHeadsUpAppearanceController.shouldBeVisible()).thenReturn(true); @@ -1046,7 +1046,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void disable_headsUpShouldBeVisibleFalse_clockNotDisabled() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mHeadsUpAppearanceController.shouldBeVisible()).thenReturn(false); @@ -1100,7 +1100,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testStatusBarIcons_hiddenThroughoutCameraLaunch() { final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -1123,7 +1123,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { @Test @DisableSceneContainer - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testStatusBarIcons_hiddenThroughoutLockscreenToDreamTransition() { final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); @@ -1159,7 +1159,7 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { } @Test - @DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) + @DisableFlags(StatusBarRootModernization.FLAG_NAME) public void testStatusBarIcons_lockscreenToDreamTransitionButNotDreaming_iconsVisible() { final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt index c435d3d99680..37671e0bc175 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/MultiSourceMinAlphaControllerTest.kt @@ -21,9 +21,9 @@ import android.testing.AndroidTestingRunner import android.testing.TestableLooper import android.view.View import androidx.test.filters.SmallTest -import com.android.systemui.Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT import com.android.systemui.SysuiTestCase import com.android.systemui.animation.AnimatorTestRule +import com.android.systemui.statusbar.core.StatusBarRootModernization import junit.framework.Assert.assertEquals import org.junit.Before import org.junit.Rule @@ -38,7 +38,7 @@ private const val INITIAL_ALPHA = 1f @RunWith(AndroidTestingRunner::class) @TestableLooper.RunWithLooper(setAsMainLooper = true) @SmallTest -@DisableFlags(FLAG_STATUS_BAR_SIMPLE_FRAGMENT) +@DisableFlags(StatusBarRootModernization.FLAG_NAME) class MultiSourceMinAlphaControllerTest : SysuiTestCase() { private val view = View(context) |