Merge "New fonts in notifications." into jb-dev

This commit is contained in:
Daniel Sandler
2012-05-16 08:06:02 -07:00
committed by Android (Google) Code Review
3 changed files with 12 additions and 24 deletions

View File

@@ -93,8 +93,6 @@
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:visibility="gone"
android:layout_weight="1"
/>
@@ -104,8 +102,6 @@
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:visibility="gone"
android:layout_weight="1"
/>
@@ -115,8 +111,6 @@
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:visibility="gone"
android:layout_weight="1"
/>
@@ -126,8 +120,6 @@
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:visibility="gone"
android:layout_weight="1"
/>
@@ -137,8 +129,6 @@
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:visibility="gone"
android:layout_weight="1"
/>

View File

@@ -239,22 +239,25 @@ please see styles_device_defaults.xml.
</style>
<!-- Notification content styles -->
<style name="TextAppearance.StatusBar.EventContent">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">12sp</item>
<item name="android:textColor">#808080</item>
<item name="android:textSize">14dp</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:textColor">#ffffff</item>
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:textSize">18dp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.StatusBar.EventContent.Line2">
<item name="android:textSize">13sp</item>
<!-- inherit all -->
</style>
<style name="TextAppearance.StatusBar.EventContent.Info">
<!-- inherit all -->
<item name="android:textSize">12sp</item>
<item name="android:textColor">#666666</item>
</style>
<style name="TextAppearance.StatusBar.EventContent.Time">
<!-- inherit all -->
<item name="android:textSize">12sp</item>
<item name="android:textColor">#666666</item>
</style>
<style name="TextAppearance.Small.CalendarViewWeekDayView">

View File

@@ -16,12 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="TextAppearance.StatusBar.Title" parent="@*android:style/TextAppearance.StatusBar">
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="TextAppearance.StatusBar.IntruderAlert"
parent="@*android:style/TextAppearance.StatusBar">
</style>
@@ -48,7 +42,7 @@
</style>
<style name="TextAppearance.StatusBar.Date" parent="@*android:style/TextAppearance.StatusBar.Icon">
<item name="android:textSize">16sp</item>
<item name="android:textSize">16dp</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@android:color/holo_blue_light</item>
</style>
@@ -57,6 +51,7 @@
<style name="TextAppearance.StatusBar.Expanded.Clock">
<item name="android:textSize">32dp</item>
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">#ffffff</item>
</style>