diff --git a/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt b/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt index 44727f29888de..48f48266fda57 100644 --- a/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt @@ -159,8 +159,7 @@ class KeyguardMediaController @Inject constructor( } fun refreshMediaPosition() { - val keyguardOrUserSwitcher = (statusBarStateController.state == StatusBarState.KEYGUARD || - statusBarStateController.state == StatusBarState.FULLSCREEN_USER_SWITCHER) + val keyguardOrUserSwitcher = (statusBarStateController.state == StatusBarState.KEYGUARD) // mediaHost.visible required for proper animations handling visible = mediaHost.visible && !bypassController.bypassEnabled && @@ -196,4 +195,4 @@ class KeyguardMediaController @Inject constructor( visibilityChangedListener?.invoke(newVisibility == View.VISIBLE) } } -} \ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt index 64ebe568c790d..6145f0ffebad0 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt @@ -567,8 +567,7 @@ class MediaHierarchyManager @Inject constructor( previousLocation = this.desiredLocation } else if (forceStateUpdate) { val onLockscreen = (!bypassController.bypassEnabled && - (statusbarState == StatusBarState.KEYGUARD || - statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) + (statusbarState == StatusBarState.KEYGUARD)) if (desiredLocation == LOCATION_QS && previousLocation == LOCATION_LOCKSCREEN && !onLockscreen) { // If media active state changed and the device is now unlocked, update the @@ -955,8 +954,7 @@ class MediaHierarchyManager @Inject constructor( return desiredLocation } val onLockscreen = (!bypassController.bypassEnabled && - (statusbarState == StatusBarState.KEYGUARD || - statusbarState == StatusBarState.FULLSCREEN_USER_SWITCHER)) + (statusbarState == StatusBarState.KEYGUARD)) val allowedOnLockscreen = notifLockscreenUserManager.shouldShowLockscreenNotifications() val location = when { dreamOverlayActive -> LOCATION_DREAM_OVERLAY @@ -1087,4 +1085,4 @@ private annotation class TransformationType @IntDef(prefix = ["LOCATION_"], value = [MediaHierarchyManager.LOCATION_QS, MediaHierarchyManager.LOCATION_QQS, MediaHierarchyManager.LOCATION_LOCKSCREEN]) @Retention(AnnotationRetention.SOURCE) -annotation class MediaLocation \ No newline at end of file +annotation class MediaLocation diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java index c0148c0ecb21d..16bc951e03232 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java @@ -37,12 +37,6 @@ public class StatusBarState { */ public static final int SHADE_LOCKED = 2; - /** - * Status bar is locked and shows the full screen user switcher. - */ - public static final int FULLSCREEN_USER_SWITCHER = 3; - - public static String toShortString(int x) { switch (x) { case SHADE: @@ -51,8 +45,6 @@ public class StatusBarState { return "SHD_LCK"; case KEYGUARD: return "KGRD"; - case FULLSCREEN_USER_SWITCHER: - return "FS_USRSW"; default: return "bad_value_" + x; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java index f56602ee2bcda..ee12cc5679feb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java @@ -76,7 +76,7 @@ public class StatusBarStateControllerImpl implements // Must be a power of 2 private static final int HISTORY_SIZE = 32; - private static final int MAX_STATE = StatusBarState.FULLSCREEN_USER_SWITCHER; + private static final int MAX_STATE = StatusBarState.SHADE_LOCKED; private static final int MIN_STATE = StatusBarState.SHADE; private static final Comparator sComparator = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java index 8330169980d46..b66a48e07777e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java @@ -34,10 +34,7 @@ public enum StatusBarStateEvent implements UiEventLogger.UiEventEnum { STATUS_BAR_STATE_KEYGUARD(430), @UiEvent(doc = "StatusBarState changed to SHADE_LOCKED state") - STATUS_BAR_STATE_SHADE_LOCKED(431), - - @UiEvent(doc = "StatusBarState changed to FULLSCREEN_USER_SWITCHER state") - STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER(432); + STATUS_BAR_STATE_SHADE_LOCKED(431); private int mId; StatusBarStateEvent(int id) { @@ -60,8 +57,6 @@ public enum StatusBarStateEvent implements UiEventLogger.UiEventEnum { return STATUS_BAR_STATE_KEYGUARD; case StatusBarState.SHADE_LOCKED: return STATUS_BAR_STATE_SHADE_LOCKED; - case StatusBarState.FULLSCREEN_USER_SWITCHER: - return STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER; default: return STATUS_BAR_STATE_UNKNOWN; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 2f3300a53ad6e..c8cc807475f39 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -2935,14 +2935,6 @@ public class StatusBar extends CoreStartable implements return updateIsKeyguard(); } - /** - * stop(tag) - * @return True if StatusBar state is FULLSCREEN_USER_SWITCHER. - */ - public boolean isFullScreenUserSwitcherState() { - return mState == StatusBarState.FULLSCREEN_USER_SWITCHER; - } - boolean updateIsKeyguard() { return updateIsKeyguard(false /* forceStateChange */); } @@ -2996,9 +2988,7 @@ public class StatusBar extends CoreStartable implements onLaunchTransitionFadingEnded(); } mMessageRouter.cancelMessages(MSG_LAUNCH_TRANSITION_TIMEOUT); - if (mUserSwitcherController != null && mUserSwitcherController.useFullscreenUserSwitcher()) { - mStatusBarStateController.setState(StatusBarState.FULLSCREEN_USER_SWITCHER); - } else if (!mLockscreenShadeTransitionController.isWakingToShadeLocked()) { + if (!mLockscreenShadeTransitionController.isWakingToShadeLocked()) { mStatusBarStateController.setState(StatusBarState.KEYGUARD); } updatePanelExpansionForKeyguard(); @@ -3009,8 +2999,6 @@ public class StatusBar extends CoreStartable implements if (mState == StatusBarState.KEYGUARD && mBiometricUnlockController.getMode() != BiometricUnlockController.MODE_WAKE_AND_UNLOCK && !mBouncerShowing) { mShadeController.instantExpandNotificationsPanel(); - } else if (mState == StatusBarState.FULLSCREEN_USER_SWITCHER) { - instantCollapseNotificationPanel(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index c2b24e523943c..d42a42364f213 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -1184,7 +1184,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb // When a dream overlay is active, scrimming will cause any expansion to immediately expand. return (mOccluded && !mDreamOverlayStateController.isOverlayActive()) || mBouncer.willDismissWithAction() - || mStatusBar.isFullScreenUserSwitcherState() || (mBouncer.isShowing() && mBouncer.isScrimmed()) || mBouncer.isFullscreenBouncer(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 49e712d386e53..1b73595beb7c5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.policy; import static android.os.UserManager.SWITCHABILITY_STATUS_OK; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -import static com.android.systemui.DejankUtils.whitelistIpcs; import android.annotation.UserIdInt; import android.app.ActivityManager; @@ -427,22 +426,6 @@ public class UserSwitcherController implements Dumpable { return mSimpleUserSwitcher; } - public boolean useFullscreenUserSwitcher() { - // Use adb to override: - // adb shell settings put system enable_fullscreen_user_switcher 0 # Turn it off. - // adb shell settings put system enable_fullscreen_user_switcher 1 # Turn it on. - // Restart SystemUI or adb reboot. - final int DEFAULT = -1; - final int overrideUseFullscreenUserSwitcher = - whitelistIpcs(() -> Settings.System.getInt(mContext.getContentResolver(), - "enable_fullscreen_user_switcher", DEFAULT)); - if (overrideUseFullscreenUserSwitcher != DEFAULT) { - return overrideUseFullscreenUserSwitcher != 0; - } - // Otherwise default to the build setting. - return mContext.getResources().getBoolean(R.bool.config_enableFullscreenUserSwitcher); - } - public void setResumeUserOnGuestLogout(boolean resume) { mResumeUserOnGuestLogout = resume; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt index 43d9a755269f2..dc7026da21946 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt @@ -95,7 +95,6 @@ class KeyguardMediaControllerTest : SysuiTestCase() { fun testVisibleOnKeyguardOrFullScreenUserSwitcher() { testStateVisibility(StatusBarState.SHADE, GONE) testStateVisibility(StatusBarState.SHADE_LOCKED, GONE) - testStateVisibility(StatusBarState.FULLSCREEN_USER_SWITCHER, VISIBLE) testStateVisibility(StatusBarState.KEYGUARD, VISIBLE) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt index d51d370eecb98..9076e1607be57 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt @@ -169,8 +169,6 @@ class LockscreenShadeTransitionControllerTest : SysuiTestCase() { transitionController.goToLockedShade(null) whenever(statusbarStateController.state).thenReturn(StatusBarState.SHADE) transitionController.goToLockedShade(null) - whenever(statusbarStateController.state).thenReturn(StatusBarState.FULLSCREEN_USER_SWITCHER) - transitionController.goToLockedShade(null) verify(statusbarStateController, never()).setState(anyInt()) } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt index b736f389ad6c0..a5ea897b6a6f8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateControllerImplTest.kt @@ -61,18 +61,16 @@ class StatusBarStateControllerImplTest : SysuiTestCase() { @Test fun testChangeState_logged() { TestableLooper.get(this).runWithLooper { - controller.state = StatusBarState.FULLSCREEN_USER_SWITCHER controller.state = StatusBarState.KEYGUARD controller.state = StatusBarState.SHADE controller.state = StatusBarState.SHADE_LOCKED } val logs = uiEventLogger.logs - assertEquals(4, logs.size) + assertEquals(3, logs.size) val ids = logs.map(UiEventLoggerFake.FakeUiEvent::eventId) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER.id, ids[0]) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_KEYGUARD.id, ids[1]) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE.id, ids[2]) - assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE_LOCKED.id, ids[3]) + assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_KEYGUARD.id, ids[0]) + assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE.id, ids[1]) + assertEquals(StatusBarStateEvent.STATUS_BAR_STATE_SHADE_LOCKED.id, ids[2]) } -} \ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt index b5b2f1fc0484d..79a2008e7542f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarStateEventTest.kt @@ -33,18 +33,16 @@ class StatusBarStateEventTest : SysuiTestCase() { StatusBarStateEvent.STATUS_BAR_STATE_SHADE, StatusBarStateEvent.STATUS_BAR_STATE_SHADE_LOCKED, StatusBarStateEvent.STATUS_BAR_STATE_KEYGUARD, - StatusBarStateEvent.STATUS_BAR_STATE_FULLSCREEN_USER_SWITCHER, StatusBarStateEvent.STATUS_BAR_STATE_UNKNOWN ) val states = listOf( StatusBarState.SHADE, StatusBarState.SHADE_LOCKED, StatusBarState.KEYGUARD, - StatusBarState.FULLSCREEN_USER_SWITCHER, -1 ) events.zip(states).forEach { (event, state) -> assertEquals(event, StatusBarStateEvent.fromState(state)) } } -} \ No newline at end of file +} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java index 4758bd4070d2b..107ba8130349d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java @@ -174,17 +174,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { verify(mBouncer).show(anyBoolean(), eq(true)); } - @Test - public void onPanelExpansionChanged_neverHidesFullscreenBouncer() { - // TODO: StatusBar should not be here, mBouncer.isFullscreenBouncer() should do the same. - when(mStatusBar.isFullScreenUserSwitcherState()).thenReturn(true); - mStatusBarKeyguardViewManager.onPanelExpansionChanged( - /* fraction= */ 0.5f, - /* expanded= */ false, - /* tracking= */ true); - verify(mBouncer).setExpansion(eq(KeyguardBouncer.EXPANSION_VISIBLE)); - } - @Test public void onPanelExpansionChanged_neverHidesScrimmedBouncer() { when(mBouncer.isShowing()).thenReturn(true); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index 1564dfe8cd06b..90b93e7974108 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -884,15 +884,6 @@ public class StatusBarTest extends SysuiTestCase { verify(mScrimController).transitionTo(eq(ScrimState.KEYGUARD)); } - @Test - public void testSetState_changesIsFullScreenUserSwitcherState() { - mStatusBar.setBarStateForTest(StatusBarState.KEYGUARD); - assertFalse(mStatusBar.isFullScreenUserSwitcherState()); - - mStatusBar.setBarStateForTest(StatusBarState.FULLSCREEN_USER_SWITCHER); - assertTrue(mStatusBar.isFullScreenUserSwitcherState()); - } - @Test public void testShowKeyguardImplementation_setsState() { when(mLockscreenUserManager.getCurrentProfiles()).thenReturn(new SparseArray<>()); @@ -903,12 +894,6 @@ public class StatusBarTest extends SysuiTestCase { mStatusBar.showKeyguardImpl(); verify(mStatusBarStateController).setState( eq(StatusBarState.KEYGUARD), eq(false) /* force */); - - // If useFullscreenUserSwitcher is true, state is set to FULLSCREEN_USER_SWITCHER. - when(mUserSwitcherController.useFullscreenUserSwitcher()).thenReturn(true); - mStatusBar.showKeyguardImpl(); - verify(mStatusBarStateController).setState( - eq(StatusBarState.FULLSCREEN_USER_SWITCHER), eq(false) /* force */); } @Test