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

am 7362e0d8: Merge "Adjust text sizes for better behavior under user scaling." into ics-mr0

Browse Source 
* commit '7362e0d8fe6bd6739dbd22c2ad4c2c7fb0f7c1d4':
  Adjust text sizes for better behavior under user scaling.
This commit is contained in:
Daniel Sandler
2011-10-14 12:24:40 -07:00
committed by Android Git Automerger
parent cf774c34bb 7362e0d8fe
commit 9a990c7990
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/res/layout/status_bar.xml
View File

@@ -77,7 +77,6 @@
android:layout_height="match_parent"
android:singleLine="true"
android:paddingRight="6dip"
android:textSize="16sp"
android:gravity="center_vertical|left"
/>
</LinearLayout>
@@ -91,7 +90,7 @@
<ImageSwitcher android:id="@+id/tickerIcon"
android:layout_width="@dimen/status_bar_icon_size"
android:layout_height="@dimen/status_bar_icon_size"
android:layout_marginRight="2dip"
android:layout_marginRight="4dip"
>
<com.android.systemui.statusbar.AnimatedImageView
android:layout_width="@dimen/status_bar_icon_size"
@@ -111,13 +110,13 @@
android:paddingTop="2dip"
android:paddingRight="10dip">
<TextView
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
/>
<TextView
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"

2
packages/SystemUI/res/layout/status_bar_expanded.xml
View File

@@ -35,7 +35,7 @@
android:background="@drawable/notification_header_bg"
>
<com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
android:textAppearance="@style/TextAppearance.StatusBar.Date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"

13
packages/SystemUI/res/values/styles.xml
View File

@@ -41,6 +41,13 @@
</style>
<style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">
<!-- Note: must be dp to fit in status bar -->
<item name="android:textSize">16dp</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@android:color/holo_blue_light</item>
</style>
<style name="TextAppearance.StatusBar.Date" parent="@*android:style/TextAppearance.StatusBar.Icon">
<item name="android:textSize">16sp</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">@android:color/holo_blue_light</item>
@@ -69,4 +76,10 @@
<item name="android:windowExitAnimation">@anim/priority_alert_exit</item>
</style>
<style name="TextAppearance.StatusBar.PhoneTicker"
parent="@*android:style/TextAppearance.StatusBar.Ticker">
<!-- Note: must be dp to fit in status bar -->
<item name="android:textSize">14dp</item>
</style>
</resources>