diff options
| author | Justin Ho <justinho@google.com> | 2011-01-28 15:02:55 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-28 15:02:55 -0800 |
| commit | 20af1c57de9651b93a35b67418263b88bc83f3e4 (patch) | |
| tree | 9e224da6096be6ba3d065075422ad06ffdbcd9b1 | |
| parent | 9eaefb821396b2ac02fcf2cceb2f242a6eb55cf0 (diff) | |
| parent | ca05585f048b1ba6716d09b318dca60a77ab3fa3 (diff) | |
| download | frameworks_base-20af1c57de9651b93a35b67418263b88bc83f3e4.zip frameworks_base-20af1c57de9651b93a35b67418263b88bc83f3e4.tar.gz frameworks_base-20af1c57de9651b93a35b67418263b88bc83f3e4.tar.bz2 | |
Merge "Correct font size for notifications & control panel." into honeycomb
5 files changed, 7 insertions, 5 deletions
diff --git a/core/res/res/layout-xlarge/status_bar_latest_event_content.xml b/core/res/res/layout-xlarge/status_bar_latest_event_content.xml index 1a3ee82..676c38b 100644 --- a/core/res/res/layout-xlarge/status_bar_latest_event_content.xml +++ b/core/res/res/layout-xlarge/status_bar_latest_event_content.xml @@ -23,14 +23,14 @@ android:singleLine="true" android:ellipsize="marquee" android:fadingEdge="horizontal" - android:layout_marginBottom="-4dp" + android:layout_marginBottom="-3dp" /> <TextView android:id="@+id/text" android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginTop="-4dp" + android:layout_marginTop="-2dp" android:singleLine="true" android:ellipsize="marquee" android:fadingEdge="horizontal" diff --git a/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml b/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml index fcbdf6d..ebdaaa3 100644 --- a/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml +++ b/core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml @@ -17,14 +17,14 @@ android:singleLine="true" android:ellipsize="marquee" android:fadingEdge="horizontal" - android:layout_marginBottom="-4dp" + android:layout_marginBottom="-3dp" /> <TextView android:id="@+id/text" android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_marginTop="-4dp" + android:layout_marginTop="-2dp" android:singleLine="true" android:ellipsize="marquee" android:fadingEdge="horizontal" diff --git a/core/res/res/values-xlarge/styles.xml b/core/res/res/values-xlarge/styles.xml index ed05cb1..dd78920 100644 --- a/core/res/res/values-xlarge/styles.xml +++ b/core/res/res/values-xlarge/styles.xml @@ -30,6 +30,7 @@ </style> <style name="TextAppearance.StatusBar.EventContent"> <item name="android:textColor">#ff999999</item> + <item name="android:textSize">14sp</item> </style> <style name="TextAppearance.StatusBar.EventContent.Title"> <item name="android:textColor">?android:attr/textColorPrimary</item> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index b828318..f54f8cc 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -224,7 +224,7 @@ <item name="android:textStyle">bold</item> </style> <style name="TextAppearance.StatusBar.EventContent"> - <item name="android:textSize">10sp</item> + <item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> </style> <style name="TextAppearance.StatusBar.EventContent.Title"> diff --git a/packages/SystemUI/res/values-xlarge/styles.xml b/packages/SystemUI/res/values-xlarge/styles.xml index fb10a24..c1cd533 100644 --- a/packages/SystemUI/res/values-xlarge/styles.xml +++ b/packages/SystemUI/res/values-xlarge/styles.xml @@ -39,6 +39,7 @@ <item name="android:layout_weight">1</item> <item name="android:layout_gravity">left|center_vertical</item> <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">18sp</item> </style> <style name="StatusBarPanelSettingsPanelSeparator"> |