From 261700695053173d502a03630f9e04bf310a9bcd Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 14 Aug 2013 16:08:45 -0400 Subject: [PATCH] Ensure LOW_PROFILE is always clear when bars are transient. Bug:10326361 Change-Id: I4d12c4973153aac72bc840840f061ec782e27a87 --- .../internal/policy/impl/PhoneWindowManager.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 9da4357d06c9..22b5f0306a65 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5114,11 +5114,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { // show navigation transient bar vis |= View.NAVIGATION_BAR_TRANSIENT; if ((mLastSystemUiFlags & View.NAVIGATION_BAR_TRANSIENT) == 0) { - vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; setBarShowingLw(mNavigationBar, true); } } } + if (mStatusTransientBar != TRANSIENT_BAR_NONE + || mNavigationTransientBar != TRANSIENT_BAR_NONE) { + vis &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; + } return vis; } @@ -5414,5 +5417,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { pw.print(prefix); pw.print("mDemoHdmiRotation="); pw.print(mDemoHdmiRotation); pw.print(" mDemoHdmiRotationLock="); pw.println(mDemoHdmiRotationLock); 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"); + } } } -- 2.11.0