summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2010-01-19 16:45:05 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-19 16:45:05 -0800
commitfd24feaf796f51866c7354a02d4d8febe255b115 (patch)
tree3a2c43068db20ec61e5b57a1e61df671938ba057 /core/res
parent290cd9ab8b5f3043e18be665763c914f4d3d7dc5 (diff)
parentc83bb730ec0333e52990a40edf6d54bb66b1d5ba (diff)
downloadframeworks_base-fd24feaf796f51866c7354a02d4d8febe255b115.zip
frameworks_base-fd24feaf796f51866c7354a02d4d8febe255b115.tar.gz
frameworks_base-fd24feaf796f51866c7354a02d4d8febe255b115.tar.bz2
Merge "Add DateTimeView, a widget that shows a time or the date depending on the current time. Use that for notifications instead of a TextView that doesn't ever update."
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/layout/status_bar_latest_event_content.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/layout/status_bar_latest_event_content.xml b/core/res/res/layout/status_bar_latest_event_content.xml
index 2f7036f..c3aa041 100644
--- a/core/res/res/layout/status_bar_latest_event_content.xml
+++ b/core/res/res/layout/status_bar_latest_event_content.xml
@@ -45,7 +45,7 @@
android:textSize="14sp"
android:paddingLeft="4dp"
/>
- <TextView android:id="@+id/time"
+ <android.widget.DateTimeView android:id="@+id/time"
android:layout_marginLeft="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"