commit eaf2322589e30a07c60c43f41f9bd860a91bf738
author Adrian Roos <roosa@google.com> Thu Jul 17 17:05:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 17 17:05:43 2014 +0000
tree ee508d25fd0ad5f6b5deab6c1fd1026affa4c8dc
parent 6f42914642159072e0555b4e10ea7fbfeb306f83
parent f7bcc1c25fe0d9f66df4faa000fa2c70cd9e3ef4

am b00b4be5: am 221433ab: Merge "Partially fix the keyguard scrim" into lmp-dev

* commit 'b00b4be5d978ea63aa0428772dbe5e593659a48f':
  Partially fix the keyguard scrim

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 608aa44..a3c84c6 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1706,7 +1706,8 @@
     @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