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

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

Browse Source
This commit is contained in:
John Spurlock
2013-08-08 19:17:31 +00:00
committed by Android (Google) Code Review
parent d646882af9 bcb21a8390
commit c059dbe9c4
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 = private static final int STATUS_OR_NAV_TRANSIENT =
View.STATUS_BAR_TRANSIENT | View.NAVIGATION_BAR_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 long AUTOHIDE_TIMEOUT_MS = 3000;
private static final float TRANSPARENT_ALPHA = 0.7f; private static final float TRANSPARENT_ALPHA = 0.7f;
@@ -1955,14 +1957,12 @@ public class PhoneStatusBar extends BaseStatusBar {
// update hiding navigation confirmation // update hiding navigation confirmation
if (mNavigationBarView != null) { if (mNavigationBarView != null) {
final int hidingNav = boolean oldShowConfirm = (oldVal & TRANSIENT_NAV_HIDING) == TRANSIENT_NAV_HIDING;
View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_ALLOW_TRANSIENT; boolean newShowConfirm = (newVal & TRANSIENT_NAV_HIDING) == TRANSIENT_NAV_HIDING;
boolean oldHidingNav = (oldVal & hidingNav) != 0; if (!oldShowConfirm && newShowConfirm) {
boolean newHidingNav = (newVal & hidingNav) != 0;
if (!oldHidingNav && newHidingNav) {
mHidingNavigationConfirmationDismissed = false; mHidingNavigationConfirmationDismissed = false;
} }
setHidingNavigationConfirmationVisible(newHidingNav); setHidingNavigationConfirmationVisible(newShowConfirm);
} }
// send updated sysui visibility to window manager // send updated sysui visibility to window manager