Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c2fdf7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove StatusBarState.FULLSCREEN_USER_SWITCHER"

parents ce63cde2 ece9543c

packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt

+2 −3
Original line number Diff line number Diff line
@@ -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 &&

packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt

+3 −5
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarState.java

+0 −8
Original line number Diff line number Diff line
@@ -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;

        }

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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<RankedListener> sComparator =

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateEvent.java

+1 −6
Original line number Diff line number Diff line
@@ -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;

        }