Merge "Always allow translucent bars for keyguard" into lmp-dev (64d04347) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -2978,7 +2978,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean immersiveSticky = (sysui & View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) != 0;
		boolean navAllowedHidden = immersive \|\| immersiveSticky;
		navTranslucent &= !immersiveSticky; // transient trumps translucent
		boolean isKeyguardShowing = isStatusBarKeyguard() && !mHideLockScreen;
		if (!isKeyguardShowing) {
		navTranslucent &= areTranslucentBarsAllowed();
		}

		// When the navigation bar isn't visible, we put up a fake
		// input window to catch all touch events. This way we can
		@@ -3102,7 +3105,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean statusBarTransient = (sysui & View.STATUS_BAR_TRANSIENT) != 0;
		boolean statusBarTranslucent = (sysui
		& (View.STATUS_BAR_TRANSLUCENT \| View.SYSTEM_UI_TRANSPARENT)) != 0;
		if (!isKeyguardShowing) {
		statusBarTranslucent &= areTranslucentBarsAllowed();
		}

		// If the status bar is hidden, we don't want to cause
		// windows behind it to scroll.
		@@ -5611,7 +5616,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		vis = (vis & ~flags) \| (oldVis & flags);
		}

		if (!areTranslucentBarsAllowed()) {
		if (!areTranslucentBarsAllowed() && transWin != mStatusBar) {
		vis &= ~(View.NAVIGATION_BAR_TRANSLUCENT \| View.STATUS_BAR_TRANSLUCENT
		\| View.SYSTEM_UI_TRANSPARENT);
		}