Merge "Partially fix the keyguard scrim" into lmp-dev

2014-07-17 10:36:28 +00:00
parent faa0192826 69e510d6f7
commit 929f4e89e0
1 changed files with 2 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1706,7 +1706,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
    @Override
    public boolean isForceHiding(WindowManager.LayoutParams attrs) {
        return (attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 ||
-                (isKeyguardHostWindow(attrs) && isKeyguardSecureIncludingHidden());
+                (isKeyguardHostWindow(attrs) && isKeyguardSecureIncludingHidden()) ||
+                (attrs.type == TYPE_KEYGUARD_SCRIM);
    }

    @Override