Keyguard: only show after screen fully turned off am: 4757c8ccf8 (67e9113e) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -4210,10 +4210,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() {
		@@ -4233,7 +4230,12 @@ public class StatusBar extends SystemUI implements DemoMode,
		updatePanelExpansionForKeyguard();
		}
		if (shouldBeKeyguard) {
		if (isGoingToSleep()
		&& mScreenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_TURNING_OFF) {
		// Delay showing the keyguard until screen turned off.
		} else {
		showKeyguardImpl();
		}
		} else {
		return hideKeyguardImpl();
		}