commit e58bb044701d0b092fb09103f14d9406a497c65b
author Craig Mautner <cmautner@google.com> Tue Jul 23 23:29:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 23 23:29:47 2013 +0000
tree a2c602dd1210724e83a5a7eb5b3e67cf07e4b772
parent 7aee681b6bb96a9988b15bbfa4fd92be587bedea
parent b816bedf6f1e6c81fd497df98aaae68a9ce546b0

Merge "Limit TYPE_SYSTEM_ERROR to system decor bounds."

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 bd56ee0..1ea7a7c 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3229,7 +3229,8 @@
             }
         }
 
-        if ((fl & FLAG_LAYOUT_NO_LIMITS) != 0) {
+        // TYPE_SYSTEM_ERROR is above the NavigationBar so it can't be allowed to extend over it.
+        if ((fl & FLAG_LAYOUT_NO_LIMITS) != 0 && attrs.type != TYPE_SYSTEM_ERROR) {
             df.left = df.top = of.left = of.top = cf.left = cf.top = vf.left = vf.top = -10000;
             df.right = df.bottom = of.right = of.bottom = cf.right = cf.bottom
                     = vf.right = vf.bottom = 10000;