diff options
| author | Daniel Sandler <dsandler@android.com> | 2011-09-07 08:25:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-07 08:25:59 -0700 |
| commit | cbdc9d2e9cba355de4f57eaa926a2d51aa343ac8 (patch) | |
| tree | e5a4897ee14e0d0a6da1c952d40a03267e8e467a /packages/SystemUI | |
| parent | 4880a736dc518b60a199ac1d2a003dc6148991ea (diff) | |
| parent | 1a21f0ab603f4bcdb73e5920a3b6b75f04316790 (diff) | |
| download | frameworks_base-cbdc9d2e9cba355de4f57eaa926a2d51aa343ac8.zip frameworks_base-cbdc9d2e9cba355de4f57eaa926a2d51aa343ac8.tar.gz frameworks_base-cbdc9d2e9cba355de4f57eaa926a2d51aa343ac8.tar.bz2 | |
Merge "Use holo_blue_light for statusbar clocks."
Diffstat (limited to 'packages/SystemUI')
4 files changed, 10 insertions, 6 deletions
diff --git a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml index d235859..5e254e8 100644 --- a/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml +++ b/packages/SystemUI/res/layout-sw600dp/status_bar_notification_area.xml @@ -89,9 +89,10 @@ <TextView android:id="@+id/time_solid" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.StatusBar.Clock" android:singleLine="true" android:textSize="40sp" - android:textColor="#ff525e79" /> + /> </com.android.systemui.statusbar.tablet.HoloClock> <TextView diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index f3d0bee..a63893e 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -72,13 +72,12 @@ <com.android.systemui.statusbar.policy.Clock android:id="@+id/clock" - android:textAppearance="@*android:style/TextAppearance.StatusBar.Icon" + android:textAppearance="@style/TextAppearance.StatusBar.Clock" android:layout_width="wrap_content" android:layout_height="match_parent" android:singleLine="true" android:paddingRight="6dip" android:textSize="16sp" - android:textStyle="bold" android:gravity="center_vertical|left" /> </LinearLayout> diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 6f47ed0..0b3fb98 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -34,9 +34,7 @@ android:paddingRight="3dp" > <com.android.systemui.statusbar.policy.DateView android:id="@+id/date" - android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title" - android:textColor="@android:color/holo_blue_light" - android:textStyle="normal" + android:textAppearance="@style/TextAppearance.StatusBar.Clock" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentLeft="true" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index ad236b7..3d49cd1 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -40,6 +40,12 @@ <item name="android:textColor">#FFFFFFFF</item> </style> + <style name="TextAppearance.StatusBar.Clock" 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> + </style> + <style name="Animation" /> <style name="Animation.ShirtPocketPanel"> |