Skip to content

Commit 57d74de

Browse files
committed
Adjust text sizes for better behavior under user scaling.
Text that is supposed to go in the status bar must be sized in dp, because the bar doesn't get bigger when the user text scale increases. Bug: 5108533 // related Change-Id: I36c3f750ec78562555d4bbe68d601d18250e36ec
1 parent 645e099 commit 57d74de

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

packages/SystemUI/res/layout/status_bar.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
android:layout_height="match_parent"
7878
android:singleLine="true"
7979
android:paddingRight="6dip"
80-
android:textSize="16sp"
8180
android:gravity="center_vertical|left"
8281
/>
8382
</LinearLayout>
@@ -91,7 +90,7 @@
9190
<ImageSwitcher android:id="@+id/tickerIcon"
9291
android:layout_width="@dimen/status_bar_icon_size"
9392
android:layout_height="@dimen/status_bar_icon_size"
94-
android:layout_marginRight="2dip"
93+
android:layout_marginRight="4dip"
9594
>
9695
<com.android.systemui.statusbar.AnimatedImageView
9796
android:layout_width="@dimen/status_bar_icon_size"
@@ -111,13 +110,13 @@
111110
android:paddingTop="2dip"
112111
android:paddingRight="10dip">
113112
<TextView
114-
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
113+
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
115114
android:layout_width="match_parent"
116115
android:layout_height="wrap_content"
117116
android:singleLine="true"
118117
/>
119118
<TextView
120-
android:textAppearance="@*android:style/TextAppearance.StatusBar.Ticker"
119+
android:textAppearance="@style/TextAppearance.StatusBar.PhoneTicker"
121120
android:layout_width="match_parent"
122121
android:layout_height="wrap_content"
123122
android:singleLine="true"

packages/SystemUI/res/layout/status_bar_expanded.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
android:background="@drawable/notification_header_bg"
3636
>
3737
<com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
38-
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
38+
android:textAppearance="@style/TextAppearance.StatusBar.Date"
3939
android:layout_width="wrap_content"
4040
android:layout_height="match_parent"
4141
android:layout_alignParentLeft="true"

packages/SystemUI/res/values/styles.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@
4141
</style>
4242

4343
<style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">
44+
<!-- Note: must be dp to fit in status bar -->
45+
<item name="android:textSize">16dp</item>
46+
<item name="android:textStyle">normal</item>
47+
<item name="android:textColor">@android:color/holo_blue_light</item>
48+
</style>
49+
50+
<style name="TextAppearance.StatusBar.Date" parent="@*android:style/TextAppearance.StatusBar.Icon">
4451
<item name="android:textSize">16sp</item>
4552
<item name="android:textStyle">normal</item>
4653
<item name="android:textColor">@android:color/holo_blue_light</item>
@@ -69,4 +76,10 @@
6976
<item name="android:windowExitAnimation">@anim/priority_alert_exit</item>
7077
</style>
7178

79+
<style name="TextAppearance.StatusBar.PhoneTicker"
80+
parent="@*android:style/TextAppearance.StatusBar.Ticker">
81+
<!-- Note: must be dp to fit in status bar -->
82+
<item name="android:textSize">14dp</item>
83+
</style>
84+
7285
</resources>

0 commit comments

Comments
 (0)