commit 12585551f4ccf08906519b9e8e9b29a5b5de93b0
author John Spurlock <jspurlock@google.com> Thu Oct 03 15:39:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 03 15:39:15 2013 -0700
tree 88ed8045f3f285b5f04e9dae9e1b1c3c1750fa24
parent 1b7ed578f2b8bd0a356f5221551c4b87db31b528
parent c4b274782793e33d58cb119b3c294bbb31daea14

am c4b27478: am 8e0ca288: Window decor rect should not include the nav bar if hidden.

* commit 'c4b274782793e33d58cb119b3c294bbb31daea14':
  Window decor rect should not include the nav bar if hidden.

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 54a5107..3232a1e 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3007,7 +3007,8 @@
                     // 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;