diff options
| author | Sara Ting <sarating@google.com> | 2012-04-18 17:04:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 17:04:52 -0700 |
| commit | d804d00dec81229f9b01c83d71bdba09210d128a (patch) | |
| tree | b1d7dc774cc85247e26fb055506c5f432b707644 /res | |
| parent | 85ff527e221a17db38ed61530d578d91873c046d (diff) | |
| parent | 75f53668f94c3ced9d3cc8583d7e45ce725ff9de (diff) | |
| download | android_packages_apps_Calendar-d804d00dec81229f9b01c83d71bdba09210d128a.tar.gz android_packages_apps_Calendar-d804d00dec81229f9b01c83d71bdba09210d128a.tar.bz2 android_packages_apps_Calendar-d804d00dec81229f9b01c83d71bdba09210d128a.zip | |
Merge "Shorten date/time info in event info to display in one line."
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/event_info.xml | 4 | ||||
| -rw-r--r-- | res/layout/event_info_dialog.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/res/layout/event_info.xml b/res/layout/event_info.xml index 47186399..b987eff3 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 78633789..4ac6400a 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 63681402..9d4e3688 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 --> |