diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-18 21:08:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-18 21:08:58 +0000 |
| commit | ac2d61a2d731946afed300d63039d6d712fd7f4c (patch) | |
| tree | 83f693550500575bab7066097b70338420bd6b52 /policy/src | |
| parent | 7d292145f1266b9ba4a231498c84265ad5193bdc (diff) | |
| parent | 900ece502fffeebcc623df60e421bedbca4aa955 (diff) | |
| download | frameworks_base-ac2d61a2d731946afed300d63039d6d712fd7f4c.zip frameworks_base-ac2d61a2d731946afed300d63039d6d712fd7f4c.tar.gz frameworks_base-ac2d61a2d731946afed300d63039d6d712fd7f4c.tar.bz2 | |
Merge "Do not show immersive mode help in touch exploration mode." into klp-dev
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 3 |
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 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 @@ 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(); } /** |