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

Merge "Ensure LOW_PROFILE is always clear when bars are transient." into klp-dev

Browse Source
This commit is contained in:
John Spurlock
2013-08-14 23:50:38 +00:00
committed by Android (Google) Code Review
parent 76e696f6d2 2617006950
commit 63169fb9a6
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -5114,11 +5114,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// show navigation transient bar // show navigation transient bar
vis |= View.NAVIGATION_BAR_TRANSIENT; vis |= View.NAVIGATION_BAR_TRANSIENT;
if ((mLastSystemUiFlags & View.NAVIGATION_BAR_TRANSIENT) == 0) { if ((mLastSystemUiFlags & View.NAVIGATION_BAR_TRANSIENT) == 0) {
vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE;
setBarShowingLw(mNavigationBar, true); setBarShowingLw(mNavigationBar, true);
} }
} }
} }
if (mStatusTransientBar != TRANSIENT_BAR_NONE
|| mNavigationTransientBar != TRANSIENT_BAR_NONE) {
vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE;
}
return vis; return vis;
} }
@@ -5414,5 +5417,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
pw.print(prefix); pw.print("mDemoHdmiRotation="); pw.print(mDemoHdmiRotation); pw.print(prefix); pw.print("mDemoHdmiRotation="); pw.print(mDemoHdmiRotation);
pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock); pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock);
pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation); pw.print(prefix); pw.print("mUndockedHdmiRotation="); pw.println(mUndockedHdmiRotation);
dumpTransient(pw, prefix,
mStatusBar, "mStatusTransientBar", mStatusTransientBar);
dumpTransient(pw, prefix,
mNavigationBar, "mNavigationTransientBar", mNavigationTransientBar);
}
private void dumpTransient(PrintWriter pw, String pre, WindowState win, String var, int val) {
if (win != null) {
pw.print(pre); pw.print(var); pw.print('=');
pw.println(val == TRANSIENT_BAR_HIDING ? "HIDING"
: val == TRANSIENT_BAR_SHOWING ? "SHOWING"
: "NONE");
}
} }
} }