Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide windows even when AOD is off" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-06 22:10:50 +00:00
committed by Android (Google) Code Review
parent 6dc57344d6 c29b146daf
commit 5c75b5b60e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2107,6 +2107,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);
}

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

@@ -4719,7 +4719,6 @@ public class StatusBar extends SystemUI implements DemoMode,
boolean dozing = mDozingRequested && mState == StatusBarState.KEYGUARD
|| mFingerprintUnlockController.getMode()
== FingerprintUnlockController.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 (mFingerprintUnlockController.getMode() ==
@@ -4728,7 +4727,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) {