Merge "Never show transient navigation bar when empty" into nyc-mr1-dev (6da66578) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -6185,9 +6185,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return;
		}
		mPendingPanicGestureUptime = SystemClock.uptimeMillis();
		if (!isNavBarEmpty(mLastSystemUiFlags)) {
		mNavigationBarController.showTransient();
		}
		}
		}
		};

		private void requestTransientBars(WindowState swipeTarget) {
		@@ -6197,7 +6199,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		return;
		}
		boolean sb = mStatusBarController.checkShowTransientBarLw();
		boolean nb = mNavigationBarController.checkShowTransientBarLw();
		boolean nb = mNavigationBarController.checkShowTransientBarLw()
		&& !isNavBarEmpty(mLastSystemUiFlags);
		if (sb \|\| nb) {
		// Don't show status bar when swiping on already visible navigation bar
		if (!nb && swipeTarget == mNavigationBar) {
		@@ -7550,8 +7553,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// we're no longer on the Keyguard and the screen is ready. We can now request the bars.
		mPendingPanicGestureUptime = 0;
		mStatusBarController.showTransient();
		if (!isNavBarEmpty(vis)) {
		mNavigationBarController.showTransient();
		}
		}

		final boolean denyTransientStatus = mStatusBarController.isTransientShowRequested()
		&& !transientStatusBarAllowed && hideStatusBarSysui;