New agenda layout changes for ICS phone

Change-Id: I8f3de982e654847f87b528416abfcc55fc9f8766

1 files changed, 44 insertions, 46 deletions

diff --git a/res/layout/agenda_item.xml b/res/layout/agenda_item.xml
index d0b55536..3aee2dcb 100644
--- a/res/layout/agenda_item.xml
+++ b/res/layout/agenda_item.xml
@@ -14,66 +14,64 @@
      limitations under the License.
 -->
 
-<com.android.calendar.agenda.AgendaItemView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/content"
-    android:layout_height="wrap_content"
+    android:layout_height="64dip"
     android:layout_width="match_parent"
+    android:orientation="horizontal"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
-    <View
-        android:id="@+id/alignment_bar"
-        android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_alignParentTop="true" />
-
-    <!-- TODO: should be aligned with @id/title correctly without using
-         android:layout_marginTop -->
     <com.android.calendar.ColorChipView
         android:id="@+id/agenda_item_color"
-        android:layout_width="25dip"
-        android:layout_height="25dip"
-        android:layout_below="@id/alignment_bar"
+        android:layout_width="24dip"
+        android:layout_height="24dip"
         android:layout_alignParentLeft="true"
-        android:layout_alignTop="@+id/title"
         android:layout_marginTop="8dip"
-        android:layout_marginLeft="16dip"
+        android:layout_marginLeft="20dip"
         android:layout_marginRight="8dip" />
 
-    <TextView
-        android:id="@+id/title"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/agenda_item_color"
-        android:layout_marginTop="0dip"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textStyle="bold"
-        android:textColor="?android:attr/textColorSecondary"
-        style="?android:attr/textAppearanceMediumInverse" />
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="16dip"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:ellipsize="marquee"
+            android:textColor="?android:attr/textColorSecondary"
+            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:ellipsize="end"
-        android:maxLines="2"
-        android:textStyle="bold"
-        android:textColor="?android:attr/textColorSecondary"
-        style="?android:attr/textAppearanceSmallInverse" />
+        <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="14sp"
+            android:ellipsize="marquee"
+            android:textColor="?android:attr/textColorSecondary"
+            style="?android:attr/textAppearanceSmallInverse" />
 
-    <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:ellipsize="end"
-        android:maxLines="2"
-        android:textColor="?android:attr/textColorSecondary"
-        style="?android:attr/textAppearanceSmallInverse" />
+        <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="14sp"
+            android:textColor="?android:attr/textColorSecondary"
+            style="?android:attr/textAppearanceSmallInverse" />
+    </LinearLayout>
 
     <ImageView
         android:id="@+id/selected_marker"
@@ -84,4 +82,4 @@
         android:visibility="gone"
         android:background="@drawable/list_activated_holo" />
 
-</com.android.calendar.agenda.AgendaItemView>
+</LinearLayout>