diff options
| -rw-r--r-- | core/res/res/drawable-hdpi/ic_lockscreen_player_background.9.png | bin | 243 -> 129 bytes | |||
| -rw-r--r-- | core/res/res/drawable-mdpi/ic_lockscreen_player_background.9.png | bin | 230 -> 118 bytes | |||
| -rw-r--r-- | core/res/res/drawable-xhdpi/ic_lockscreen_player_background.9.png | bin | 245 -> 144 bytes | |||
| -rw-r--r-- | core/res/res/layout/keyguard_transport_control.xml | 21 | ||||
| -rw-r--r-- | policy/src/com/android/internal/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 Binary files differindex b187358..fbb75b5 100644 --- a/core/res/res/drawable-hdpi/ic_lockscreen_player_background.9.png +++ b/core/res/res/drawable-hdpi/ic_lockscreen_player_background.9.png 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 Binary files differindex 8cfd1af..17d97c4 100644 --- a/core/res/res/drawable-mdpi/ic_lockscreen_player_background.9.png +++ b/core/res/res/drawable-mdpi/ic_lockscreen_player_background.9.png 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 Binary files differindex 7fb0cbc..393bca6 100644 --- a/core/res/res/drawable-xhdpi/ic_lockscreen_player_background.9.png +++ b/core/res/res/drawable-xhdpi/ic_lockscreen_player_background.9.png diff --git a/core/res/res/layout/keyguard_transport_control.xml b/core/res/res/layout/keyguard_transport_control.xml index c951c45..7e2a31c 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 96998af..c7cb59e 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) { |
