Merge "AOD: Hide SIM PIN entry while dozing" into oc-dr1-dev (1d42219e) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		* {@link KeyguardBouncer#needsFullscreenBouncer()}.
		*/
		protected void showBouncerOrKeyguard(boolean hideBouncerWhenShowing) {
		if (mBouncer.needsFullscreenBouncer()) {
		if (mBouncer.needsFullscreenBouncer() && !mDozing) {

		// The keyguard might be showing (already). So we need to hide it.
		mStatusBar.hideKeyguard();
		@@ -258,9 +258,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		}

		public void setDozing(boolean dozing) {
		if (mDozing != dozing) {
		mDozing = dozing;
		reset(dozing /* hideBouncerWhenShowing */);
		updateStates();
		}
		}

		public void onScreenTurnedOff() {
		mScreenTurnedOn = false;