commit 18e82e7928ec57f7e39e1aa24f8ecbeb40f5e35d
author John Spurlock <jspurlock@google.com> Fri Oct 18 14:15:29 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 18 14:15:29 2013 -0700
tree 9f3dab1d3b4f80bd5ecbb099e5a3c85c6db6d84c
parent 91b47365f68e29467912ddfa39dea30e661aff68
parent 0945bc15034ac05d2ca803f6297b03dcbcbea2d8

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

* commit '0945bc15034ac05d2ca803f6297b03dcbcbea2d8':
  Do not show immersive mode help in touch exploration mode.

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 816672f..dcaf3d6 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -5186,7 +5186,8 @@
         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();
     }
 
     /**