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

Keyguard: only show after screen fully turned off

Browse Source 
Fixes an issue where the keyguard was displayed before the screen
was turned off fully, causing the AOD screen to briefly show during
the screen off animation.

Change-Id: Idc4621995bd67c1db255fab5a8de60d3aeef5d18
Fixes: 63526727
Test: Turn screen off. Make sure the AOD clock is not visible
This commit is contained in:
Adrian Roos
2017-07-18 15:50:41 +02:00
parent 731d4dfe60
commit 4757c8ccf8
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4199,10 +4199,7 @@ public class StatusBar extends SystemUI implements DemoMode,
public void showKeyguard() {
mKeyguardRequested = true;
// Unconditionally show keyguard again. There's some logic that relies on this
// being called even when the keyguard is already showing, e.g. for updating
// sensitiveness of notifications and making sure the panels are expanded.
showKeyguardImpl();
updateIsKeyguard();
}
public boolean hideKeyguard() {
@@ -4222,7 +4219,12 @@ public class StatusBar extends SystemUI implements DemoMode,
updatePanelExpansionForKeyguard();
}
if (shouldBeKeyguard) {
showKeyguardImpl();
if (isGoingToSleep()
&& mScreenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_TURNING_OFF) {
// Delay showing the keyguard until screen turned off.
} else {
showKeyguardImpl();
}
} else {
return hideKeyguardImpl();
}