Merge "Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows." (12319bad) · Commits · e / os / android_frameworks_base

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -95,7 +95,9 @@ public class StatusBarKeyguardViewManager {
		}

		private void showBouncer() {
		if (!mOccluded) {
		mBouncer.show();
		}
		updateStates();
		}

		@@ -103,7 +105,12 @@ public class StatusBarKeyguardViewManager {
		* Reset the state of the view.
		*/
		public void reset() {
		if (mOccluded) {
		mPhoneStatusBar.hideKeyguard();
		mBouncer.hide();
		} else {
		showBouncerOrKeyguard();
		}
		updateStates();
		}

		@@ -114,6 +121,7 @@ public class StatusBarKeyguardViewManager {

		public void onScreenTurnedOn(final IKeyguardShowCallback callback) {
		mScreenOn = true;
		reset();
		if (callback != null) {
		callbackAfterDraw(callback);
		}
		@@ -147,7 +155,7 @@ public class StatusBarKeyguardViewManager {
		public void setOccluded(boolean occluded) {
		mOccluded = occluded;
		mStatusBarWindowManager.setKeyguardOccluded(occluded);
		updateStates();
		reset();
		}

		/**