summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Craik <ccraik@android.com> 2014-03-20 02:35:47 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-20 02:35:47 +0000
commit99689a6874c7c465ed97dba625d38e3f1599963f (patch)
treefc73460cdd54a3da06a107714d91c7249170358b
parent857fe511fe7139a41ad3d587a73758be53340e90 (diff)
parent9208bb4a2b40e8269f601fa096ae9c88d6d1ce7a (diff)
am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '9208bb4a2b40e8269f601fa096ae9c88d6d1ce7a': Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
index 6aa0a4bfd1c7..7d0059f235b8 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
@@ -388,6 +388,7 @@ public class KeyguardViewManager {
} else {
mWindowLayoutParams.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
}
+ mWindowLayoutParams.format = show ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE;
mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams);
}