From 68d468019ea7552c0b35f3f59a768552b5de3bcb Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 17 Apr 2017 11:38:16 -0700 Subject: [PATCH] AOD: disable quicksettings while dozing Test: Trigger ambient display / AOD, verify quicksettings is not expandable Bug: 37303800 Change-Id: I694360f4d728ff9714036d0b92176c922ff53e9a --- .../src/com/android/systemui/statusbar/phone/StatusBar.java | 2 ++ 1 file changed, 2 insertions(+) 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 f0d38b2e3d3c8..df814a090cc5d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -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.