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

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

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4210,10 +4210,7 @@ public class StatusBar extends SystemUI implements DemoMode,

	public void showKeyguard() {		public void showKeyguard() {
	mKeyguardRequested = true;		mKeyguardRequested = true;
	// Unconditionally show keyguard again. There's some logic that relies on this		updateIsKeyguard();
	// being called even when the keyguard is already showing, e.g. for updating
	// sensitiveness of notifications and making sure the panels are expanded.
	showKeyguardImpl();
	}		}

	public boolean hideKeyguard() {		public boolean hideKeyguard() {
	@@ -4233,7 +4230,12 @@ public class StatusBar extends SystemUI implements DemoMode,
	updatePanelExpansionForKeyguard();		updatePanelExpansionForKeyguard();
	}		}
	if (shouldBeKeyguard) {		if (shouldBeKeyguard) {
			if (isGoingToSleep()
			&& mScreenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_TURNING_OFF) {
			// Delay showing the keyguard until screen turned off.
			} else {
	showKeyguardImpl();		showKeyguardImpl();
			}
	} else {		} else {
	return hideKeyguardImpl();		return hideKeyguardImpl();
	}		}