b/3277450 Part deux of calendar widget update to 'final' UX.

Change-Id: I05a62db9760372be134bc2aba60515f747710a66

1 files changed, 78 insertions, 45 deletions

diff --git a/res/layout/appwidget.xml b/res/layout/appwidget.xml
index 31852dcb..356861f3 100644
--- a/res/layout/appwidget.xml
+++ b/res/layout/appwidget.xml
@@ -18,19 +18,34 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_marginTop="4dip"
+    android:layout_marginBottom="20dip"
+    android:layout_marginLeft="12dip"
+    android:layout_marginRight="12dip"
     android:orientation="vertical"
     android:background="@drawable/gradient_bg_cal_widget_holo"
     android:focusable="true"
     android:clickable="true">
 
+    <!--  Spacer -->
+    <FrameLayout
+        android:layout_width="0dip"
+        android:layout_height="5dip"
+        android:focusable="false"
+        android:clickable="false"
+        android:background="#00000000" />
+
     <!-- Header -->
     <LinearLayout
         android:id="@+id/header"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="19dip"
+        android:layout_height="42dip"
+        android:layout_marginTop="5dip"
+        android:layout_marginLeft="5dip"
+        android:layout_marginRight="5dip"
+        android:paddingLeft="16dip"
         android:paddingRight="8dip"
+        android:orientation="horizontal"
         android:background="@drawable/header_bg_cal_widget_holo">
         <LinearLayout
             android:id="@+id/holder"
@@ -39,58 +54,60 @@
             android:layout_gravity="center_vertical"
             android:layout_marginRight="5dip"
             android:orientation="vertical">
-            <TextView
-                android:id="@+id/day_of_week"
+            <FrameLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="-6dip"
-                android:textColor="@color/appwidget_week"
-                android:textSize="14sp"
-                android:textStyle="bold"
-                android:shadowColor="@color/text_shadow_color"
-                android:shadowRadius="1"
-                android:gravity="left"
-                android:singleLine="true" />
-            <TextView
-                android:id="@+id/month"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/day_of_week"
+                    android:textColor="@color/appwidget_week"
+                    android:shadowColor="#66ffffff"
+                    android:shadowRadius="2"
+                    style="@style/WidgetDayOfWeekStyle" />
+                <TextView
+                    android:id="@+id/day_of_week_shadow"
+                    android:textColor="@color/appwidget_week"
+                    android:shadowColor="#4d000000"
+                    android:shadowRadius="1"
+                    style="@style/WidgetDayOfWeekStyle" />
+            </FrameLayout>
+            <FrameLayout
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/appwidget_month"
-                android:textSize="14sp"
-                android:shadowColor="@color/text_shadow_color"
-                android:shadowRadius="1"
-                android:gravity="left"
-                android:singleLine="true" />
+                android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/month_shadow"
+                    android:textColor="@color/appwidget_month"
+                    android:shadowColor="#66ffffff"
+                    android:shadowRadius="2"
+                    style="@style/WidgetMonthStyle" />
+                <TextView
+                    android:id="@+id/month"
+                    android:textColor="@color/appwidget_month"
+                    android:shadowColor="#4d000000"
+                    android:shadowRadius="1"
+                    style="@style/WidgetMonthStyle" />
+            </FrameLayout>
         </LinearLayout>
+
         <FrameLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dip"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_gravity="center_vertical|left"
             android:layout_toRightOf="@id/holder">
             <TextView
                 android:id="@+id/day_of_month_shadow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/appwidget_date"
-                android:textSize="42sp"
-                android:textStyle="bold"
-                android:shadowColor="@color/text_shadow_color"
+                android:textColor="#00000000"
+                android:shadowColor="#0DFFFFFF"
                 android:shadowRadius="3"
-                android:gravity="left"
-                android:singleLine="true" />
+                style="@style/WidgetDayStyle" />
             <TextView
                 android:id="@+id/day_of_month"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/appwidget_date"
-                android:textSize="42sp"
-                android:textStyle="bold"
-                android:shadowColor="#FF000000"
+                android:textColor="#4DFFFFFF"
+                android:shadowColor="#80000000"
                 android:shadowRadius="1"
-                android:gravity="left"
-                android:singleLine="true" />
+                style="@style/WidgetDayStyle" />
         </FrameLayout>
+
         <ImageButton
             android:id="@+id/new_event_button"
             android:layout_width="wrap_content"
@@ -108,14 +125,30 @@
         android:focusable="false"
         android:clickable="false" />
 
-    <!-- Events container -->
+    <!-- Event list -->
     <ListView
         android:id="@+id/events_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="0dip"
-        android:layout_marginRight="0dip"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_marginLeft="1dip"
+        android:layout_marginRight="4dip"
         android:divider="#00000000"
         android:dividerHeight="0dip"
         android:cacheColorHint="#00000000" />
-</LinearLayout>
\ No newline at end of file
+
+    <!-- Separator -->
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-3dip"
+        android:background="@drawable/list_div_top_btm_cal_widget_holo"
+        android:focusable="false"
+        android:clickable="false" />
+
+    <!--  Spacer -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="2dip"
+        android:background="#00000000"/>
+</LinearLayout>