Fix 5493266: Properly restore background after playing music

KeyguardViewBase maintains the transparent background for all lock screen
views.  The background was being overwritten by the change to make lock
screen opaque when music was being shown.

Change-Id: Id1ab415f68746b20c9229fa58fef9ec8be354f01

Author: Jim Miller

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

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

@@ -254,7 +254,7 @@ public void requestHide(View view) {
 
             // TODO: examine all widgets to derive clock status
             mUpdateMonitor.reportClockVisible(true);
-            setBackgroundDrawable(null);
+            resetBackground();
         }
 
         public boolean isVisible(View self) {