From 254c7fee700d754fff3d62f3d35ca13f12752b7b Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Fri, 29 Aug 2014 23:45:49 -0400
Subject: Fix text colors in the CellBroadcast list.

Also make sure the notification form is visible on
lockscreens, and other L improvements.

Bug: 17311748
Bug: 17333464
Change-Id: I23231a767d298f7a10d6c484d0beca075799382e
---
 res/layout/cell_broadcast_list_item.xml   | 48 ++++++++++++++++---------------
 res/layout/cell_broadcast_list_screen.xml |  4 +--
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/cell_broadcast_list_item.xml b/res/layout/cell_broadcast_list_item.xml
index 95f8ff69..489039f2 100644
--- a/res/layout/cell_broadcast_list_item.xml
+++ b/res/layout/cell_broadcast_list_item.xml
@@ -19,43 +19,45 @@
 
 <com.android.cellbroadcastreceiver.CellBroadcastListItem xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:background="@drawable/list_item_background_unread"
-    android:paddingRight="10dip" >
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp"
+    >
 
     <TextView android:id="@+id/channel"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMediumInverse"
-        android:singleLine="true"
-        android:layout_marginTop="6dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginLeft="7dip"
-        android:layout_alignParentLeft="true"
+        android:layout_marginEnd="16dip"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_alignWithParentIfMissing="true"
-        android:layout_toLeftOf="@+id/date"
-        android:ellipsize="marquee"  />
+        android:layout_toStartOf="@+id/date"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="#DD000000"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        />
 
     <TextView android:id="@+id/date"
-        android:layout_marginTop="6dip"
-        android:layout_marginRight="5dip"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmallInverse"
+        android:layout_alignParentEnd="true"
+        android:layout_alignBaseline="@id/channel"
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true" />
+        />
 
     <TextView android:id="@+id/message"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmallInverse"
+        android:layout_below="@id/channel"
+        android:layout_marginTop="4dp"
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:layout_marginBottom="6dip"
-        android:layout_marginLeft="7dip"
-        android:layout_alignParentBottom="true"
-        android:layout_alignWithParentIfMissing="true"
-        android:ellipsize="end" />
+        android:ellipsize="marquee"
+        />
 
 </com.android.cellbroadcastreceiver.CellBroadcastListItem>
diff --git a/res/layout/cell_broadcast_list_screen.xml b/res/layout/cell_broadcast_list_screen.xml
index 1e963151..fd7f784d 100644
--- a/res/layout/cell_broadcast_list_screen.xml
+++ b/res/layout/cell_broadcast_list_screen.xml
@@ -26,9 +26,7 @@
                 android:layout_height="match_parent"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="insideOverlay"
-                android:background="@android:color/white"
-                android:cacheColorHint="@android:color/white"
-                android:fadingEdgeLength="16dip" />
+                />
 
         <TextView android:id="@+android:id/empty"
                 android:layout_width="match_parent"
-- 
cgit v1.2.3