Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Never show transient navigation bar when empty" into nyc-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-07-26 22:41:54 +00:00
committed by Android (Google) Code Review
parent 57de824d64 1f4259057e
commit 6da6657858
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -6185,7 +6185,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return;
}
mPendingPanicGestureUptime = SystemClock.uptimeMillis();
mNavigationBarController.showTransient();
if (!isNavBarEmpty(mLastSystemUiFlags)) {
mNavigationBarController.showTransient();
}
}
}
};
@@ -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,7 +7553,9 @@ 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();
mNavigationBarController.showTransient();
if (!isNavBarEmpty(vis)) {
mNavigationBarController.showTransient();
}
}
final boolean denyTransientStatus = mStatusBarController.isTransientShowRequested()