Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0

core/res/res/layout/keyguard_transport_control.xml

@@ -19,23 +19,28 @@
      but rather as include tags for this file or the layout will break. -->
 <com.android.internal.widget.TransportControlView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/transport_controls"
-    android:background="@drawable/ic_lockscreen_player_background">
+    android:id="@+id/transport_controls">
 
-    <ImageView
-        android:id="@+id/albumart"
+    <!-- FrameLayout used as scrim to show between album art and buttons -->
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="fill"
-        android:scaleType="centerCrop"
-        android:adjustViewBounds="false"
+        android:foreground="@drawable/ic_lockscreen_player_background">
+        <!-- We use ImageView for its cropping features, otherwise could be android:background -->
+        <ImageView
+            android:id="@+id/albumart"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="fill"
+            android:scaleType="centerCrop"
+            android:adjustViewBounds="false"
         />
+    </FrameLayout>
 
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#c8000000"
         android:layout_gravity="bottom">
         <TextView
             android:id="@+id/title"

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

@@ -42,8 +42,10 @@ import android.content.res.Resources;
 import android.content.ServiceConnection;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
@@ -241,6 +243,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
 
             // TODO: examine all widgets to derive clock status
             mUpdateMonitor.reportClockVisible(false);
+
+            // TODO: We should disable the wallpaper instead
+            setBackgroundColor(0xff000000);
         }
 
         public void requestHide(View view) {
@@ -249,6 +254,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler
 
             // TODO: examine all widgets to derive clock status
             mUpdateMonitor.reportClockVisible(true);
+            setBackgroundDrawable(null);
         }
 
         public boolean isVisible(View self) {