Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 (6b024448) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/KeyguardViewBase.java

+24 −19

Original line number	Diff line number	Diff line
		@@ -47,11 +47,8 @@ public abstract class KeyguardViewBase extends FrameLayout {
		private AudioManager mAudioManager;
		private TelephonyManager mTelephonyManager = null;

		public KeyguardViewBase(Context context) {
		super(context);

		// This is a faster way to draw the background on devices without hardware acceleration
		setBackgroundDrawable(new Drawable() {
		Drawable mBackgroundDrawable = new Drawable() {
		@Override
		public void draw(Canvas canvas) {
		canvas.drawColor(BACKGROUND_COLOR, PorterDuff.Mode.SRC);
		@@ -69,7 +66,15 @@ public abstract class KeyguardViewBase extends FrameLayout {
		public int getOpacity() {
		return PixelFormat.TRANSLUCENT;
		}
		});
		};

		public KeyguardViewBase(Context context) {
		super(context);
		resetBackground();
		}

		public void resetBackground() {
		setBackgroundDrawable(mBackgroundDrawable);
		}

		// used to inject callback

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler

		// TODO: examine all widgets to derive clock status
		mUpdateMonitor.reportClockVisible(true);
		setBackgroundDrawable(null);
		resetBackground();
		}

		public boolean isVisible(View self) {