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

Commit 1eb27d06 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

Change-Id: Icf289127886daf7eccd383aef18bd155f0d3ec67
parents f63d9790 1c4c981c

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

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

                        || !mUserSwitcherController.isSimpleUserSwitcher())

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

                && !mDozing

                && !ONLY_CORE_APPS);

    }
@@ -4312,6 +4313,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.