diff options
| author | 2011-11-01 13:05:41 -0700 | |
|---|---|---|
| committer | 2011-11-01 13:05:41 -0700 | |
| commit | 7775f52e4aa7703a5721378f5a1103d9486af895 (patch) | |
| tree | e7653e47220c92853218a1bc71820922b4e0c6e6 | |
| parent | a67217c35ec43e06598b71feae63ce675fa9cac7 (diff) | |
| parent | e37233038ed8775ebdb8ade95a7ff2c150c840c7 (diff) | |
Merge "Bring timestamps back to notifications." into ics-mr1
| -rw-r--r-- | core/res/res/layout/status_bar_latest_event_content_large_icon.xml | 32 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 13 |
2 files changed, 35 insertions, 10 deletions
diff --git a/core/res/res/layout/status_bar_latest_event_content_large_icon.xml b/core/res/res/layout/status_bar_latest_event_content_large_icon.xml index 6e8c9215eca4..a2253b7b320e 100644 --- a/core/res/res/layout/status_bar_latest_event_content_large_icon.xml +++ b/core/res/res/layout/status_bar_latest_event_content_large_icon.xml @@ -7,16 +7,34 @@ android:paddingLeft="12dp" android:paddingRight="12dp" > - <TextView android:id="@+id/title" - android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" + <LinearLayout + android:id="@+id/line1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="marquee" - android:fadingEdge="horizontal" - /> + android:orientation="horizontal" + > + <TextView android:id="@+id/title" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:layout_weight="1" + /> + <DateTimeView android:id="@+id/time" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_weight="0" + android:singleLine="true" + android:gravity="center" + android:paddingLeft="8dp" + /> + </LinearLayout> <TextView android:id="@+id/text2" - android:textAppearance="@style/TextAppearance.StatusBar.EventContent" + android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="-2dp" diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 924695404f73..8356985c1c80 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -216,8 +216,8 @@ please see styles_device_defaults.xml. <item name="windowEnterAnimation">@null</item> <item name="windowExitAnimation">@anim/fade_out</item> </style> - <!-- Status Bar Styles --> + <!-- Status Bar Styles --> <style name="TextAppearance.StatusBar"> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> </style> @@ -229,18 +229,25 @@ please see styles_device_defaults.xml. <style name="TextAppearance.StatusBar.Icon"> </style> + <!-- Notification content styles --> <style name="TextAppearance.StatusBar.EventContent"> <item name="android:textColor">?android:attr/textColorSecondary</item> - <item name="android:textSize">13sp</item> + <item name="android:textSize">12sp</item> </style> <style name="TextAppearance.StatusBar.EventContent.Title"> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">16sp</item> <item name="android:textStyle">bold</item> </style> - <style name="TextAppearance.StatusBar.EventContent.Info"> + <style name="TextAppearance.StatusBar.EventContent.Line2"> <item name="android:textSize">13sp</item> </style> + <style name="TextAppearance.StatusBar.EventContent.Info"> + <!-- inherit all --> + </style> + <style name="TextAppearance.StatusBar.EventContent.Time"> + <!-- inherit all --> + </style> <style name="TextAppearance.Small.CalendarViewWeekDayView"> <item name="android:textStyle">bold</item> |