Fixes to tablet agenda layouts

Change-Id: Id8f6697c3852fc0ad883f5562cb5687ce54ab6a1

4 files changed, 63 insertions, 55 deletions

diff --git a/res/layout/actionbar_pulldown_menu_button.xml b/res/layout/actionbar_pulldown_menu_button.xml
index 2f24ca93..05c1841a 100644
--- a/res/layout/actionbar_pulldown_menu_button.xml
+++ b/res/layout/actionbar_pulldown_menu_button.xml
@@ -25,6 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="24sp"
+        android:textColor="@color/calendar_view_switch_menu_text_color"
         android:layout_weight="1" />
 
     <TextView android:id="@+id/button_date"
@@ -32,6 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dip"
         android:layout_marginRight="8dip"
+        android:textColor="@color/calendar_view_switch_menu_text_color"
         android:textSize="18sp" />
 </LinearLayout>
 
diff --git a/res/layout/actionbar_pulldown_menu_top_button.xml b/res/layout/actionbar_pulldown_menu_top_button.xml
index 1ce2633a..6b087796 100644
--- a/res/layout/actionbar_pulldown_menu_top_button.xml
+++ b/res/layout/actionbar_pulldown_menu_top_button.xml
@@ -27,14 +27,14 @@
         android:textSize="12sp"
         android:layout_marginTop="4dip"
         android:layout_marginBottom="-8dip"
-        android:textColor="@color/drop_down_menu_text_color"
+        android:textColor="@color/calendar_view_switch_menu_text_color"
         android:gravity="left" />
 
     <TextView android:id="@+id/top_button_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="24sp"
-        android:textColor="@color/drop_down_menu_text_color"
+        android:textColor="@color/calendar_view_switch_menu_text_color"
         android:gravity="left" />
 </LinearLayout>
 
diff --git a/res/layout/agenda_day.xml b/res/layout/agenda_day.xml
index efa15b00..8ddf9c8e 100644
--- a/res/layout/agenda_day.xml
+++ b/res/layout/agenda_day.xml
@@ -23,8 +23,8 @@
     android:layout_height="wrap_content">
     <View
         android:id="@+id/top_divider_simple"
-        android:background="?android:attr/listDivider"
         android:layout_height="1px"
+        android:background="@color/agenda_list_separator_color"
         android:layout_width="match_parent" />
     <View
         android:id="@+id/top_divider_past_present"
@@ -44,17 +44,13 @@
             android:layout_marginBottom="-8dip"
             android:layout_marginLeft="20dip"
             android:textSize="12sp"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/agenda_day_item_text_color" />
         <TextView
             android:id="@+id/date"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:layout_marginLeft="20dip"
             android:textSize="24sp"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/agenda_day_item_text_color" />
     </LinearLayout>
-    <View
-        android:background="?android:attr/listDivider"
-        android:layout_height="1px"
-        android:layout_width="match_parent" />
 </LinearLayout>
diff --git a/res/layout/agenda_item.xml b/res/layout/agenda_item.xml
index 3aee2dcb..1f529852 100644
--- a/res/layout/agenda_item.xml
+++ b/res/layout/agenda_item.xml
@@ -17,62 +17,72 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/content"
-    android:layout_height="64dip"
+    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
-    <com.android.calendar.ColorChipView
-        android:id="@+id/agenda_item_color"
-        android:layout_width="24dip"
-        android:layout_height="24dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginTop="8dip"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="8dip" />
+    <View
+        android:layout_height="1px"
+        android:background="@color/agenda_list_separator_color"
+        android:layout_width="match_parent" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        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" />
+    android:layout_height="64dip"
+    android:layout_width="match_parent"
+    android:orientation="horizontal"
+    android:minHeight="?android:attr/listPreferredItemHeight">
+        <com.android.calendar.ColorChipView
+            android:id="@+id/agenda_item_color"
+            android:layout_width="24dip"
+            android:layout_height="24dip"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="8dip"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="8dip" />
 
-        <TextView
-            android:id="@+id/when"
+        <LinearLayout
             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" />
+            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/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>
+            <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:singleLine="true"
+                android:ellipsize="marquee"
+                android:textSize="14sp"
+                android:textColor="@color/agenda_item_where_text_color"
+                style="?android:attr/textAppearanceSmallInverse" />
+        </LinearLayout>
+    </LinearLayout>
     <ImageView
         android:id="@+id/selected_marker"
         android:layout_width="wrap_content"