Shorten date/time info in event info to display in one line.
1) Don't show the year if it is the current year, 2) shorten day/month names for multiday events, 3) display "Today" or "Tomorrow" when possible, 4) use short timezone string. (b/6285801)
Change-Id: Idc4646c15f90ea6803cdff7cde985550501f62cf
diff --git a/res/layout/event_info.xml b/res/layout/event_info.xml
index 4718639..b987eff 100644
--- a/res/layout/event_info.xml
+++ b/res/layout/event_info.xml
@@ -111,7 +111,7 @@
<!-- WHEN -->
<TextView
- android:id="@+id/when_date"
+ android:id="@+id/when_datetime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -120,7 +120,7 @@
style="?android:attr/textAppearanceLarge" />
<TextView
- android:id="@+id/when_time"
+ android:id="@+id/when_repeat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-3dip"
diff --git a/res/layout/event_info_dialog.xml b/res/layout/event_info_dialog.xml
index 7863378..4ac6400 100644
--- a/res/layout/event_info_dialog.xml
+++ b/res/layout/event_info_dialog.xml
@@ -118,7 +118,7 @@
<!-- WHEN -->
<TextView
- android:id="@+id/when_date"
+ android:id="@+id/when_datetime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
@@ -129,7 +129,7 @@
style="?android:attr/textAppearanceLarge" />
<TextView
- android:id="@+id/when_time"
+ android:id="@+id/when_repeat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 72caa86..0efd66d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,6 +29,10 @@
<string name="timezone_label">Time zone</string>
<!-- This is the label for the Guests/Attendees of an event -->
<string name="attendees_label">Guests</string>
+ <!-- Text to show when an event starts on the current day -->
+ <string name="today">Today</string>
+ <!-- Text to show when an event starts on the next day -->
+ <string name="tomorrow">Tomorrow</string>
<!-- Some events repeat daily, weekly, monthly, or yearly. This is the label
for all the choices about how often an event repeats (including the choice
@@ -515,9 +519,6 @@
<!-- Caption to show on gadget when there are no upcoming calendar events -->
<string name="gadget_no_events">No upcoming calendar events</string>
- <!-- Text to show on gadget when an event starts on the next day -->
- <string name="tomorrow">Tomorrow</string>
-
<!-- Text to show on gadget when an event is currently in progress -->