Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bring timestamps back to notifications." into ics-mr1

Browse Source
This commit is contained in:
Daniel Sandler
2011-11-01 13:05:41 -07:00
committed by Android (Google) Code Review
parent a67217c35e e37233038e
commit 7775f52e4a
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/res/res/layout/status_bar_latest_event_content_large_icon.xml
View File

@@ -7,16 +7,34 @@
android:paddingLeft="12dp" android:paddingLeft="12dp"
android:paddingRight="12dp" android:paddingRight="12dp"
> >
<TextView android:id="@+id/title" <LinearLayout
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" android:id="@+id/line1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:orientation="horizontal"
android:ellipsize="marquee" >
android:fadingEdge="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" <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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-2dp" android:layout_marginTop="-2dp"

13
core/res/res/values/styles.xml
View File

@@ -216,8 +216,8 @@ please see styles_device_defaults.xml.
<item name="windowEnterAnimation">@null</item> <item name="windowEnterAnimation">@null</item>
<item name="windowExitAnimation">@anim/fade_out</item> <item name="windowExitAnimation">@anim/fade_out</item>
</style> </style>
<!-- Status Bar Styles -->
<!-- Status Bar Styles -->
<style name="TextAppearance.StatusBar"> <style name="TextAppearance.StatusBar">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
</style> </style>
@@ -229,18 +229,25 @@ please see styles_device_defaults.xml.
<style name="TextAppearance.StatusBar.Icon"> <style name="TextAppearance.StatusBar.Icon">
</style> </style>
<!-- Notification content styles -->
<style name="TextAppearance.StatusBar.EventContent"> <style name="TextAppearance.StatusBar.EventContent">
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">13sp</item> <item name="android:textSize">12sp</item>
</style> </style>
<style name="TextAppearance.StatusBar.EventContent.Title"> <style name="TextAppearance.StatusBar.EventContent.Title">
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="TextAppearance.StatusBar.EventContent.Info"> <style name="TextAppearance.StatusBar.EventContent.Line2">
<item name="android:textSize">13sp</item> <item name="android:textSize">13sp</item>
</style> </style>
<style name="TextAppearance.StatusBar.EventContent.Info">
<!-- inherit all -->
</style>
<style name="TextAppearance.StatusBar.EventContent.Time">
<!-- inherit all -->
</style>
<style name="TextAppearance.Small.CalendarViewWeekDayView"> <style name="TextAppearance.Small.CalendarViewWeekDayView">
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>