Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06398768 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents 4de8cb50 02c4c8a7

core/res/res/drawable-hdpi/ic_lockscreen_player_background.9.png

−114 B (129 B)
Loading image diff...

core/res/res/drawable-mdpi/ic_lockscreen_player_background.9.png

−112 B (118 B)
Loading image diff...

core/res/res/drawable-xhdpi/ic_lockscreen_player_background.9.png

−101 B (144 B)
Loading image diff...

core/res/res/layout/keyguard_transport_control.xml

+13 −8
Original line number Original line Diff line number Diff line
@@ -19,9 +19,14 @@ 
     but rather as include tags for this file or the layout will break. -->

     but rather as include tags for this file or the layout will break. -->

<com.android.internal.widget.TransportControlView

<com.android.internal.widget.TransportControlView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/transport_controls"

    android:id="@+id/transport_controls">

    android:background="@drawable/ic_lockscreen_player_background">





    <!-- FrameLayout used as scrim to show between album art and buttons -->

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:foreground="@drawable/ic_lockscreen_player_background">

        <!-- We use ImageView for its cropping features, otherwise could be android:background -->

        <ImageView

        <ImageView

            android:id="@+id/albumart"

            android:id="@+id/albumart"

            android:layout_width="match_parent"

            android:layout_width="match_parent"
@@ -30,12 +35,12 @@ 
            android:scaleType="centerCrop"

            android:scaleType="centerCrop"

            android:adjustViewBounds="false"

            android:adjustViewBounds="false"

        />

        />

    </FrameLayout>





    <LinearLayout

    <LinearLayout

        android:orientation="vertical"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:background="#c8000000"

        android:layout_gravity="bottom">

        android:layout_gravity="bottom">

        <TextView

        <TextView

            android:id="@+id/title"

            android:id="@+id/title"

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -42,8 +42,10 @@ import android.content.res.Resources; 
import android.content.ServiceConnection;

import android.content.ServiceConnection;

import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.ColorFilter;

import android.graphics.ColorFilter;

import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;
@@ -241,6 +243,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler 




            // TODO: examine all widgets to derive clock status

            // TODO: examine all widgets to derive clock status

            mUpdateMonitor.reportClockVisible(false);

            mUpdateMonitor.reportClockVisible(false);



            // TODO: We should disable the wallpaper instead

            setBackgroundColor(0xff000000);

        }

        }





        public void requestHide(View view) {

        public void requestHide(View view) {
@@ -249,6 +254,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler 




            // TODO: examine all widgets to derive clock status

            // TODO: examine all widgets to derive clock status

            mUpdateMonitor.reportClockVisible(true);

            mUpdateMonitor.reportClockVisible(true);

            setBackgroundDrawable(null);

        }

        }





        public boolean isVisible(View self) {

        public boolean isVisible(View self) {