Merge "Fix lockscreen occluded states #2." (943ac44a) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -73,8 +73,7 @@ public class StatusBarKeyguardViewManager {
		public void show(Bundle options) {
		mShowing = true;
		mStatusBarWindowManager.setKeyguardShowing(true);
		showBouncerOrKeyguard();
		updateStates();
		reset();
		}

		/**
		@@ -105,6 +104,7 @@ public class StatusBarKeyguardViewManager {
		* Reset the state of the view.
		*/
		public void reset() {
		if (mShowing) {
		if (mOccluded) {
		mPhoneStatusBar.hideKeyguard();
		mBouncer.hide();
		@@ -113,6 +113,7 @@ public class StatusBarKeyguardViewManager {
		}
		updateStates();
		}
		}

		public void onScreenTurnedOff() {
		mScreenOn = false;
		@@ -121,7 +122,6 @@ public class StatusBarKeyguardViewManager {

		public void onScreenTurnedOn(final IKeyguardShowCallback callback) {
		mScreenOn = true;
		reset();
		if (callback != null) {
		callbackAfterDraw(callback);
		}