Merge "Recurrence picker UI re-design" into ics-ub-calendar-cream

5 files changed, 23 insertions, 12 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1e42c00a..34ac0b12 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -239,10 +239,10 @@
 
     <!-- Recurrence picker: How events are to be repeated.  [CHAR LIMIT = 20] -->
     <string-array name="recurrence_freq">
-        <item >One-time event</item>
-        <item >Daily</item>
-        <item >Weekly</item>
-        <item >Monthly</item>
-        <item >Yearly</item>
+        <item >ONE-TIME EVENT</item>
+        <item >DAILY</item>
+        <item >WEEKLY</item>
+        <item >MONTHLY</item>
+        <item >YEARLY</item>
     </string-array>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ad72d1f2..0a73b92d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -164,4 +164,6 @@
     <color name="appwidget_when">#ffffffff</color>
     <color name="appwidget_where">#ffffffff</color>
     <color name="appwidget_no_events">#ffffffff</color>
+
+    <color name="recurrence_picker_background">#fff2f2f2</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4965a00e..7ef0ad0c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -53,4 +53,7 @@
     <dimen name="agenda_item_right_margin">4dip</dimen>
     <dimen name="today_icon_text_size">14sp</dimen>
     <dimen name="color_view_touch_area_increase">16dp</dimen>
+
+    <dimen name="recurrence_picker_height">340dp</dimen>
+    <dimen name="recurrence_picker_width">300dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 508a21e6..3125be5d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -683,16 +683,18 @@
     <!-- Tell user not to check a checkbox [CHAR LIMIT=30] -->
     <string name="do_not_check">Do NOT check -></string>
 
-    <!-- Dialog title for configuring a repeating event[CHAR LIMIT=20] -->
+    <!-- Dialog title for recurrence picker for configuring a repeating event[CHAR LIMIT=20] -->
     <string name="recurrence_dialog_title">Repeat</string>
+    <!-- Dialog title for recurrence picker when one-time event is selected [CHAR LIMIT=20] -->
+    <string name="recurrence_dialog_title_never">Never repeats</string>
     <!-- String to describe how frequent to repeat an event e.g. every 5 days [CHAR LIMIT=20] -->
-    <string name="recurrence_interval_daily">every <xliff:g id="count">%d</xliff:g> day(s)</string>
+    <string name="recurrence_interval_daily">Every <xliff:g id="count">%d</xliff:g> day(s)</string>
     <!-- String to describe how frequent to repeat an event e.g. every 5 weeks [CHAR LIMIT=20] -->
-    <string name="recurrence_interval_weekly">every <xliff:g id="count">%d</xliff:g> week(s)</string>
+    <string name="recurrence_interval_weekly">Every <xliff:g id="count">%d</xliff:g> week(s)</string>
     <!-- String to describe how frequent to repeat an event e.g. every 5 months [CHAR LIMIT=20] -->
-    <string name="recurrence_interval_monthly">every <xliff:g id="count">%d</xliff:g> month(s)</string>
+    <string name="recurrence_interval_monthly">Every <xliff:g id="count">%d</xliff:g> month(s)</string>
     <!-- String to describe how frequent to repeat an event e.g. every 5 years [CHAR LIMIT=20] -->
-    <string name="recurrence_interval_yearly">every <xliff:g id="count">%d</xliff:g> year(s)</string>
+    <string name="recurrence_interval_yearly">Every <xliff:g id="count">%d</xliff:g> year(s)</string>
 
     <!-- Repeat an monthly event on the same day of every month [CHAR LIMIT=20] -->
     <string name="recurrence_month_pattern_by_day">on the same day each month</string>
@@ -701,7 +703,7 @@
     <string name="recurrence_month_pattern_by_day_of_week">on every <xliff:g id="nth">%1$s</xliff:g> <xliff:g id="day_of_week">%2$s</xliff:g></string>
 
     <!-- Specifies that a repeating event to repeat forever (based on the defined frequency) instead of ending at a future date[CHAR LIMIT=25] -->
-    <string name="recurrence_end_continously">Repeats forever</string>
+    <string name="recurrence_end_continously">Continuously</string>
     <!-- Specifies that a repeating event to repeat until a certain date[CHAR LIMIT=25] -->
     <string name="recurrence_end_date_label">Until a date</string>
     <!-- Specifies that a repeating event to repeat until a certain date[CHAR LIMIT=25] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ee5f405d..377c831b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -84,6 +84,10 @@
         <item name="android:textColor">#FF777777</item>
     </style>
 
+    <style name="TextAppearance.Recurrence_Button" parent="TextAppearance.EditEvent_Label">
+        <item name="android:textColor">#FF000000</item>
+    </style>
+
     <style name="TextAppearance.EditEvent_LabelSmall" parent="TextAppearance.EditEvent_Small">
         <item name="android:minHeight">24dip</item>
         <item name="android:layout_width">144dip</item>
@@ -251,7 +255,7 @@
     </style>
 
     <style name="TextAppearance.RecurrencePickerStyle">
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">15sp</item>
     </style>
 
     <style name="RecurrenceDayOfWeekStyle">