Merge "Fix broken status bar when activity is showing above keyguard" (379ac2d8) · Commits · e / os / android_frameworks_base

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public class StatusBarKeyguardViewManager {
		private boolean mScreenOn = false;
		private KeyguardBouncer mBouncer;
		private boolean mShowing;
		private boolean mOccluded = false;

		public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback,
		LockPatternUtils lockPatternUtils) {
		@@ -102,9 +103,11 @@ public class StatusBarKeyguardViewManager {
		}

		public void showBouncer() {
		if (!mOccluded) {
		mBouncer.show();
		updateBackButtonState();
		}
		}

		/**
		* Reset the state of the view.
		@@ -152,6 +155,13 @@ public class StatusBarKeyguardViewManager {
		}

		public void setOccluded(boolean occluded) {
		mOccluded = occluded;
		if (occluded) {
		mPhoneStatusBar.hideKeyguard();
		mBouncer.hide();
		} else {
		showBouncerOrKeyguard();
		}
		mStatusBarWindowManager.setKeyguardOccluded(occluded);
		}