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

Commit da2259a4 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "AOD: disable quicksettings while dozing" into oc-dev am: 1c4c981c 

am: 1eb27d06

Change-Id: I75bac43421227497d68e5e28790c256f86624421
parents fab97627 1eb27d06

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −0
Original line number Diff line number Diff line
@@ -1914,6 +1914,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                && (mUserSetup || mUserSwitcherController == null

                        || !mUserSwitcherController.isSimpleUserSwitcher())

                && ((mDisabled2 & StatusBarManager.DISABLE2_QUICK_SETTINGS) == 0)

                && !mDozing

                && !ONLY_CORE_APPS);

    }
@@ -4325,6 +4326,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mScrimController.setDozing(mDozing);

        mKeyguardIndicationController.setDozing(mDozing);

        mNotificationPanel.setDark(mDozing);

        updateQsExpansionEnabled();



        // Immediately abort the dozing from the doze scrim controller in case of wake-and-unlock

        // for pulsing so the Keyguard fade-out animation scrim can take over.