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

am c059dbe9: Merge "Fix recent regression in hideytoast." into klp-dev

Browse Source 
* commit 'c059dbe9c46d4b7f096826f9ce27f01491cc8087':
  Fix recent regression in hideytoast.
This commit is contained in:
John Spurlock
2013-08-08 15:55:39 -07:00
committed by Android Git Automerger
parent 4a76922e6c c059dbe9c4
commit d5e9f2c159
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -129,6 +129,8 @@ public class PhoneStatusBar extends BaseStatusBar {
private static final int STATUS_OR_NAV_TRANSIENT =
View.STATUS_BAR_TRANSIENT | View.NAVIGATION_BAR_TRANSIENT;
private static final int TRANSIENT_NAV_HIDING =
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT;
private static final long AUTOHIDE_TIMEOUT_MS = 3000;
private static final float TRANSPARENT_ALPHA = 0.7f;
@@ -1955,14 +1957,12 @@ public class PhoneStatusBar extends BaseStatusBar {
// update hiding navigation confirmation
if (mNavigationBarView != null) {
final int hidingNav =
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT;
boolean oldHidingNav = (oldVal & hidingNav) != 0;
boolean newHidingNav = (newVal & hidingNav) != 0;
if (!oldHidingNav && newHidingNav) {
boolean oldShowConfirm = (oldVal & TRANSIENT_NAV_HIDING) == TRANSIENT_NAV_HIDING;
boolean newShowConfirm = (newVal & TRANSIENT_NAV_HIDING) == TRANSIENT_NAV_HIDING;
if (!oldShowConfirm && newShowConfirm) {
mHidingNavigationConfirmationDismissed = false;
}
setHidingNavigationConfirmationVisible(newHidingNav);
setHidingNavigationConfirmationVisible(newShowConfirm);
}
// send updated sysui visibility to window manager