From 02c4c8a700ab2c5dc10566550ba0cab121eff0ce Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 17 Oct 2011 21:05:38 -0700
Subject: [PATCH] Fix 5288804: Make music trasports in lockscreen more closely
 match design

This fixes three issues;
- Make the background black while the transport is showing.
- Show scrim sandwiched between artwork and overlapping UI.
- Remove gaps in sides of background assets.

Change-Id: I563fc680c4c042d8b25ec37332aeab528cf838ca
---
 .../ic_lockscreen_player_background.9.png     | Bin 243 -> 129 bytes
 .../ic_lockscreen_player_background.9.png     | Bin 230 -> 118 bytes
 .../ic_lockscreen_player_background.9.png     | Bin 245 -> 144 bytes
 .../res/layout/keyguard_transport_control.xml |  21 +++++++++++-------
 .../policy/impl/LockPatternKeyguardView.java  |   6 +++++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/core/res/res/drawable-hdpi/ic_lockscreen_player_background.9.png b/core/res/res/drawable-hdpi/ic_lockscreen_player_background.9.png
index b18735871884e1ae8af4b1fe6ddb14e7296ee098..fbb75b548dd2e0879dc3feadce997904069f4373 100644
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^tPBi{794Cq*5p5yN<hlP)5S3);_%y>8+jWHM4TPp
z+Y75Kp2_ubHBZC3ib<u~7P*(rJgv%RrSx+twg@<Jz=<E?F^i4wEjEr@{JyR-dp7&e
XOQyX#OXMVhW-@rX`njxgN@xNA>xd{a

literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^Yzz#HmK;EmVe|CB79hn^?Bp530R%N1DIGvQXMsm#
zF#`j4CkQi|pFF)5C^*&A#W5tJ_3h2Od=3UYZ4cSRUj@Z1vR*Y=wJp@nex}YnS<~v0
zwQTBV?&_{JjriWT`uw^%XL5W#-f@)#>P7~>2PPbiW4iDBQp4VMm3FR|WFqg%)xNzp
z&e`EsUfJer6nmdMoa=owUZykt+=Z+sv44|Q=I@jL-oD~`#+%83$tpIgRlE!<xIT9M
Zv(`_JOlAMK*U=JWzNf37%Q~loCIE#kQL+F4

diff --git a/core/res/res/drawable-mdpi/ic_lockscreen_player_background.9.png b/core/res/res/drawable-mdpi/ic_lockscreen_player_background.9.png
index 8cfd1afbeff81a0e6c8c142fef8a705d15b448ad..17d97c4332ab3d0e1d712dbeac1b35f5b7b1f993 100644
GIT binary patch
literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^EI@pLgAGV3#2s)4QnsEhjv*e$-(FwHd%!^CNWlC3
z!Lu*Md=eIkN=tb8#mpjvAv8^SgIco!M-v3?e=wKN<}&NI+S}sqm^W+RKb^RRB?D*>
NgQu&X%Q~loCIHYPCc*#!

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^tU!E`gAGWs9H_VhqKch7LpXq-h9ji|$mcBZh%9Dc
z;O+!rM)Q-W*8&AQJY5_^B3j?haO7)H;9*h!p*a7==9;-*7rABlDs+6@uvb7W_!fis
zfio6|81g>bEW6AgmcVvRWM&fr*f+4{9Dm`XefG8N1TJlpyR-CcO*S7tcETw#WbMt3
zit|OeeCM6%GhXFie)aaO`o!nfc^<cymcERh^6y5_-%KvPhC-MBiq@PmS+n>f(+hxZ
OV(@hJb6Mw<&;$TDwo_gJ

diff --git a/core/res/res/drawable-xhdpi/ic_lockscreen_player_background.9.png b/core/res/res/drawable-xhdpi/ic_lockscreen_player_background.9.png
index 7fb0cbc91b95ebb4249b9e6f930f4fdaf7cf24d1..393bca6882cd994dd1c2365c3468dc4aaba4d2d1 100644
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^Yzz#H^ErSdL(Qed<v=Rj)5S3)<KEj_yLlTJc$^*I
z+Y8UX=))}J#mG7(+~(xPwG+1Z-d1_J^}Mz3rhbq~*g(Vl1nIqpt$s0_e!;lT|8R9~
ZF~dp~#mYy)-KRmyJzf1=);T3K0RZT8Dfs{Z

literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^><kQy3pv<;thEX2rT{6HVkgfK4j`!ENa+CbISV`@
ziy0WWJ3*My{N(AiK*8yrE{-7?jc;!`a<v%nFdTUE$oYHbKa;qSU7}qYNmDsFUP(wL
z-40eZUfl6@Vb%WL^MAhP@0%u}ob+d#kz$L069*b`U83vv+0541nUSf_?y{O1XP+oe
zj=Qo@T(soR`WFE&F8n)_zUIw4v*gd;b~WvK9kBiLwwWuP+qqulDLQi8?|7?m?%@Ai
cshN_(3m+zG<(>3c19T#Tr>mdKI;Vst0Mhkc-v9sr

diff --git a/core/res/res/layout/keyguard_transport_control.xml b/core/res/res/layout/keyguard_transport_control.xml
index c951c45a0fc28..7e2a31c2480c9 100644
--- a/core/res/res/layout/keyguard_transport_control.xml
+++ b/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"
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
index 96998afa8f6ca..c7cb59e0f1fa1 100644
--- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
+++ b/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) {