diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-18 14:20:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-18 14:20:35 -0700 |
| commit | e255d4e78aa1d659a7f1220626a2387a9456f6d0 (patch) | |
| tree | bbd09c8d08ff646d5d2fc2d9f2adbd2622f87d5b /policy | |
| parent | c6e72066eae3776db18399dac605f673712f104c (diff) | |
| parent | 18e82e7928ec57f7e39e1aa24f8ecbeb40f5e35d (diff) | |
| download | frameworks_base-e255d4e78aa1d659a7f1220626a2387a9456f6d0.zip frameworks_base-e255d4e78aa1d659a7f1220626a2387a9456f6d0.tar.gz frameworks_base-e255d4e78aa1d659a7f1220626a2387a9456f6d0.tar.bz2 | |
am 18e82e79: am 0945bc15: am ac2d61a2: Merge "Do not show immersive mode help in touch exploration mode." into klp-dev
* commit '18e82e7928ec57f7e39e1aa24f8ecbeb40f5e35d':
Do not show immersive mode help in touch exploration mode.
Diffstat (limited to 'policy')
| -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 6808adb..020c1fd 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5194,7 +5194,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(); } /** |