Commit dbd60a71 authored Mar 20, 2014 by Chris Craik Committed by Android Git Automerger Mar 20, 2014

am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen...

am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"

* commit '99689a68':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON

parents 244d18bf 99689a68

packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}