am ac2d61a2: Merge "Do not show immersive mode help in touch exploration mode." into klp-dev

* commit 'ac2d61a2d731946afed300d63039d6d712fd7f4c': Do not show immersive mode help in touch exploration mode.
2013-10-18 14:12:15 -07:00
parent 16e8c4f7db ac2d61a2d7
commit 0945bc1503
1 changed files with 2 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -5186,7 +5186,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
        final int flags = View.SYSTEM_UI_FLAG_IMMERSIVE | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
        return mNavigationBar != null
                && (vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0
-                && (vis & flags) != 0;
+                && (vis & flags) != 0
+                && canHideNavigationBar();
    }

    /**