b/5340881 Update Widget to show allDay events nicely

We were hiding all day events because we didn't have a good way of
showing them. This adds much better treatment for all day events
in the widget and reshows them.

Change-Id: I333e7808e8d9e61c1f5b866aa5c73ac2c8b8b6d9

1 files changed, 22 insertions, 57 deletions

diff --git a/res/layout/widget_all_day_item.xml b/res/layout/widget_all_day_item.xml
index fbe01b48..658804b8 100644
--- a/res/layout/widget_all_day_item.xml
+++ b/res/layout/widget_all_day_item.xml
@@ -17,67 +17,32 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/content"
-    android:layout_height="wrap_content"
+    android:layout_height="24dip"
     android:layout_width="match_parent"
-    android:minHeight="?android:attr/listPreferredItemHeight"
     android:background="@drawable/bg_event_cal_widget_holo">
-
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/widget_row"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:paddingBottom="2dp"
-        android:orientation="horizontal"
-        android:minHeight="?android:attr/listPreferredItemHeight">
-        <ImageView
-            android:id="@+id/agenda_item_color"
-            android:layout_width="12dip"
-            android:layout_height="24dip"
-            android:scaleType="fitXY"
-            android:layout_alignParentLeft="true"
-            android:layout_marginRight="4dip" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginRight="4dip"
-            android:orientation="vertical">
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="2"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:ellipsize="marquee"
-                android:textColor="@color/appwidget_title"
-                style="?android:attr/textAppearanceMediumInverse" />
-
-            <TextView
-                android:id="@+id/when"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/title"
-                android:layout_alignLeft="@+id/title"
-                android:singleLine="true"
-                android:textSize="12sp"
-                android:ellipsize="marquee"
-                android:textColor="@color/appwidget_when"
-                style="?android:attr/textAppearanceSmallInverse" />
+        android:layout_height="match_parent"
+        />
 
-            <TextView
-                android:id="@+id/where"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/when"
-                android:layout_alignLeft="@+id/title"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:textSize="12sp"
-                android:textColor="@color/appwidget_where"
-                style="?android:attr/textAppearanceSmallInverse" />
-        </LinearLayout>
-    </LinearLayout>
+    <ImageView
+        android:id="@+id/agenda_item_color"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"
+        android:layout_alignParentLeft="true"/>
 
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="4dip"
+        android:singleLine="true"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        android:ellipsize="marquee"
+        android:textColor="@color/appwidget_title"
+        android:gravity="center_vertical|left"
+        style="?android:attr/textAppearanceMediumInverse" />
 </FrameLayout>