summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-10-18 15:53:27 -0400
committerThe Android Automerger <android-build@google.com>2013-10-18 14:48:57 -0700
commit9f6a3c203a1df59ad8424712a25d64bd580d63b5 (patch)
tree8fd291cfa77317843a83b7e49d3679ea529820d2
parent9c4f5904afc14b91786c4882912141da58398401 (diff)
downloadbase-9f6a3c203a1df59ad8424712a25d64bd580d63b5.tar.gz
Do not show immersive mode help in touch exploration mode.
Bug: 11277364 Change-Id: Ifafcbff38e34c0ef08d9a466d93ce591369183a3
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 816672f7787c..dcaf3d68fed3 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 @@ 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();
}
/**