summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-10-04 09:10:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 09:10:48 -0700
commite9335bab10d563481136f939cabecda643c1638b (patch)
tree13f7feb52f3c14bebfb81f3816cf622223456c3d /policy
parent414fb0df7b547f33e3a3b8588c7d536a090d8925 (diff)
parent12585551f4ccf08906519b9e8e9b29a5b5de93b0 (diff)
downloadframeworks_base-e9335bab10d563481136f939cabecda643c1638b.zip
frameworks_base-e9335bab10d563481136f939cabecda643c1638b.tar.gz
frameworks_base-e9335bab10d563481136f939cabecda643c1638b.tar.bz2
am 12585551: am c4b27478: am 8e0ca288: Window decor rect should not include the nav bar if hidden.
* commit '12585551f4ccf08906519b9e8e9b29a5b5de93b0': Window decor rect should not include the nav bar if hidden.
Diffstat (limited to 'policy')
-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 9c0761f..02b6960 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3012,7 +3012,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Ensure policy decor includes status bar
dcf.top = mStableTop;
}
- if ((sysUiFl & View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION) == 0) {
+ if ((sysUiFl & View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION) == 0
+ && (sysUiFl & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
// Ensure policy decor includes navigation bar
dcf.bottom = mStableBottom;
dcf.right = mStableRight;