ldpi: Update lockscreen for #11326 changes

Change-Id: I9d77c681c987ad7fc51d4f98f6950589d474024d

1 files changed, 59 insertions, 29 deletions

diff --git a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
index ce8bc99..dca7e36 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
+++ b/overlay/ldpi/frameworks/base/core/res/res/layout/keyguard_screen_tab_unlock.xml
@@ -70,7 +70,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/carrier"
-            android:layout_marginTop="22dip"
+            android:layout_marginTop="26dip"
             android:layout_marginLeft="20dip"
             android:paddingBottom="2dip"
             >
@@ -115,27 +115,52 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             />
 
-        <TextView
-            android:id="@+id/status1"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/status_box"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/date"
-            android:layout_marginTop="4dip"
-            android:layout_marginLeft="24dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:drawablePadding="4dip"
-            />
+            android:orientation="vertical"
+            android:layout_below="@id/date">
 
-        <TextView
-            android:id="@+id/status2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/status1"
-            android:layout_marginTop="0dip"
-            android:layout_marginLeft="24dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:drawablePadding="4dip"
-            />
+            <TextView
+                android:id="@+id/status_charging"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dip"
+                android:layout_marginLeft="24dip"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:drawablePadding="4dip"
+                />
+
+            <TextView
+                android:id="@+id/status_alarm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dip"
+                android:layout_marginLeft="24dip"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:drawablePadding="4dip"
+                android:drawableLeft="@drawable/ic_lock_idle_alarm"
+                />
+
+            <TextView
+                android:id="@+id/status_calendar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dip"
+                android:layout_marginLeft="24dip"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:drawablePadding="4dip"
+                android:drawableLeft="@drawable/ic_lock_idle_calendar"
+                />
+
+        </LinearLayout>
 
         <TextView
             android:id="@+id/customMsg"
@@ -144,7 +169,7 @@
             android:layout_marginTop="0dip"
             android:layout_marginLeft="24dip"
             android:layout_marginRight="24dip"
-            android:layout_below="@id/status2"
+            android:layout_below="@id/status_box"
             android:textAppearance="?android:attr/textAppearanceSmall"
             />
 
@@ -163,9 +188,9 @@
         <ImageButton android:id="@+id/albumArt"
             android:layout_width="105dip"
             android:layout_height="105dip"
-            android:layout_below="@+id/musicNowPlaying"
+            android:layout_above="@+id/musicNowPlaying"
             android:layout_centerInParent="true"
-            android:layout_marginTop="22dip"
+            android:layout_marginTop="4dip"
             android:adjustViewBounds="true"
             android:background="@color/transparent"
             android:scaleType="fitCenter"
@@ -188,7 +213,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="40dip"
+            android:layout_marginBottom="60dip"
             />
 
         <com.android.internal.widget.RotarySelector
@@ -230,7 +255,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_alignParentBottom="true"
-            android:padding="10px"
+            android:padding="5px"
             android:background="@color/transparent"
             android:visibility="gone"
             />
@@ -241,7 +266,7 @@
             android:src="@drawable/ic_media_pause"
             android:layout_centerInParent="true"
             android:layout_alignParentBottom="true"
-            android:padding="10px"
+            android:padding="5px"
             android:background="@color/transparent"
             android:visibility="gone"
             />
@@ -252,7 +277,7 @@
             android:src="@drawable/ic_media_previous"
             android:layout_alignParentBottom="true"
             android:layout_marginRight="20dip"
-            android:padding="10px"
+            android:padding="5px"
             android:layout_toLeftOf="@+id/musicControlPause"
             android:background="@color/transparent"
             android:visibility="gone"
@@ -264,7 +289,7 @@
             android:src="@drawable/ic_media_next"
             android:layout_alignParentBottom="true"
             android:layout_marginLeft="20dip"
-            android:padding="10px"
+            android:padding="5px"
             android:layout_toRightOf="@+id/musicControlPause"
             android:background="@color/transparent"
             android:visibility="gone"
@@ -273,13 +298,18 @@
             android:id="@+id/musicNowPlaying"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_above="@+id/musicControlPause"
+            android:gravity="center"
             android:layout_centerInParent="true"
             android:lines="1"
             android:scrollHorizontally="true"
             android:ellipsize="marquee"
             android:paddingTop="10dip"
-            android:gravity="bottom"
             android:layout_alignWithParentIfMissing="true"
+            android:singleLine="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
             android:textAppearance="?android:attr/textAppearanceSmall"
             />
     </RelativeLayout>