diff options
| author | Sara Ting <sarating@google.com> | 2012-04-09 15:37:10 -0700 |
|---|---|---|
| committer | Sara Ting <sarating@google.com> | 2012-04-18 16:55:15 -0700 |
| commit | 75f53668f94c3ced9d3cc8583d7e45ce725ff9de (patch) | |
| tree | 56ca9d102b8e6acd70e592d0624949e9871cee1c /res/layout | |
| parent | 5a50a9cb1a668f64225b859885babb9ef9c76801 (diff) | |
| download | android_packages_apps_Calendar-75f53668f94c3ced9d3cc8583d7e45ce725ff9de.tar.gz android_packages_apps_Calendar-75f53668f94c3ced9d3cc8583d7e45ce725ff9de.tar.bz2 android_packages_apps_Calendar-75f53668f94c3ced9d3cc8583d7e45ce725ff9de.zip | |
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
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/event_info.xml | 4 | ||||
| -rw-r--r-- | res/layout/event_info_dialog.xml | 4 |
2 files changed, 4 insertions, 4 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" |