Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0

2 files changed, 25 insertions, 20 deletions

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java
index de156c9ba48f..26bd69775876 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewBase.java
@@ -47,29 +47,34 @@ 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
+    Drawable mBackgroundDrawable = new Drawable() {
+        @Override
+        public void draw(Canvas canvas) {
+            canvas.drawColor(BACKGROUND_COLOR, PorterDuff.Mode.SRC);
+        }
 
-        // This is a faster way to draw the background on devices without hardware acceleration
-        setBackgroundDrawable(new Drawable() {
-            @Override
-            public void draw(Canvas canvas) {
-                canvas.drawColor(BACKGROUND_COLOR, PorterDuff.Mode.SRC);
-            }
+        @Override
+        public void setAlpha(int alpha) {
+        }
 
-            @Override
-            public void setAlpha(int alpha) {
-            }
+        @Override
+        public void setColorFilter(ColorFilter cf) {
+        }
 
-            @Override
-            public void setColorFilter(ColorFilter cf) {
-            }
+        @Override
+        public int getOpacity() {
+            return PixelFormat.TRANSLUCENT;
+        }
+    };
 
-            @Override
-            public int getOpacity() {
-                return PixelFormat.TRANSLUCENT;
-            }
-        });
+    public KeyguardViewBase(Context context) {
+        super(context);
+        resetBackground();
+    }
+
+    public void resetBackground() {
+        setBackgroundDrawable(mBackgroundDrawable);
     }
 
     // used to inject callback
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index 7a72dcf6b635..b4db01d424e1 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
@@ -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) {