diff options
| author | Chris Craik <ccraik@android.com> | 2014-03-19 20:33:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 20:33:13 -0700 |
| commit | d4541e882d690e551ef7029a2eabf005cff743d1 (patch) | |
| tree | d04ceaec8d6a1eccbbb19a3734b8c368827ccda9 /packages/Keyguard | |
| parent | c4830712bf432280d79324df4cd3d890b54f7670 (diff) | |
| parent | dbd60a71b5d7ac55a91ccd938121e133e17ed0cb (diff) | |
| download | frameworks_base-d4541e882d690e551ef7029a2eabf005cff743d1.zip frameworks_base-d4541e882d690e551ef7029a2eabf005cff743d1.tar.gz frameworks_base-d4541e882d690e551ef7029a2eabf005cff743d1.tar.bz2 | |
am dbd60a71: am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit 'dbd60a71b5d7ac55a91ccd938121e133e17ed0cb':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java | 1 |
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 8738288..5b35ba8 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java @@ -400,6 +400,7 @@ public class KeyguardViewManager { } else { mWindowLayoutParams.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; } + mWindowLayoutParams.format = show ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE; mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams); } |