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

Commit 5a4f92c2 authored Jul 02, 2018 by Lucas Dupin

Hide windows even when AOD is off

AOD might be off but it can become visible when the user double taps
or lifts the phone. We should prepare the window manager for these
cases.

Test: turn AOD on and off, set screen lock to 'None', double tap display
Bug: 110938816
Change-Id: I6f2db86579d5b86a86fcd1a4515ee77c78460c9d

parent 19bbcfff

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2103,6 +2103,9 @@ public class KeyguardViewMediator extends SystemUI {
		pw.print(" mDrawnCallback: "); pw.println(mDrawnCallback);
		}

		/**
		* @param aodShowing true when AOD - or ambient mode - is showing.
		*/
		public void setAodShowing(boolean aodShowing) {
		setShowingLocked(mShowing, aodShowing);
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -4733,7 +4733,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		boolean dozing = mDozingRequested && mState == StatusBarState.KEYGUARD
		\|\| mBiometricUnlockController.getMode()
		== BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;
		final boolean alwaysOn = DozeParameters.getInstance(mContext).getAlwaysOn();
		// When in wake-and-unlock we may not have received a change to mState
		// but we still should not be dozing, manually set to false.
		if (mBiometricUnlockController.getMode() ==
		@@ -4742,7 +4741,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		if (mDozing != dozing) {
		mDozing = dozing;
		mKeyguardViewMediator.setAodShowing(mDozing && alwaysOn);
		mKeyguardViewMediator.setAodShowing(mDozing);
		mStatusBarWindowManager.setDozing(mDozing);
		mStatusBarKeyguardViewManager.setDozing(mDozing);
		if (mAmbientIndicationContainer instanceof DozeReceiver) {