commit 411a9fbb348bd5c6879e95b365d7c45f504acfc4
author John Spurlock <jspurlock@google.com> Wed Aug 14 16:57:23 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 16:57:23 2013 -0700
tree 493bde4c68817732832c207229d8cdda602145f7
parent 4439a7eb07bdaea95803ecfe7a92809b40a576b1
parent 6d59c85c09a9eaf770c342a1751b760315ccb95d

am 6d59c85c: am 63169fb9: Merge "Ensure LOW_PROFILE is always clear when bars are transient." into klp-dev

* commit '6d59c85c09a9eaf770c342a1751b760315ccb95d':
  Ensure LOW_PROFILE is always clear when bars are transient.

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 9da4357..22b5f03 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 @@
                 // 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 @@
         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");
+        }
     }
 }