diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-12 13:29:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 13:29:32 +0000 |
| commit | 943a3df4f26faec35b05eb3d47f1325a615b814c (patch) | |
| tree | 14d3d7b21fbed9a66c1c4b2e764f5366305fe73a /packages/SystemUI/res | |
| parent | 86543724e2bf46d04d04c311cc5be666ac5cde09 (diff) | |
| parent | 542576548c4d1f7b59c314360414190cab5a9a05 (diff) | |
| download | frameworks_base-943a3df4f26faec35b05eb3d47f1325a615b814c.zip frameworks_base-943a3df4f26faec35b05eb3d47f1325a615b814c.tar.gz frameworks_base-943a3df4f26faec35b05eb3d47f1325a615b814c.tar.bz2 | |
am 913f7dcc: Merge "Set primary color of SystemUI."
* commit '913f7dcc1938f8609f0f9f0acf6a8dbc586bc961':
Set primary color of SystemUI.
Diffstat (limited to 'packages/SystemUI/res')
4 files changed, 10 insertions, 3 deletions
diff --git a/packages/SystemUI/res/drawable/notification_header_bg.xml b/packages/SystemUI/res/drawable/notification_header_bg.xml index b6b2e9a..09d0d7d 100644 --- a/packages/SystemUI/res/drawable/notification_header_bg.xml +++ b/packages/SystemUI/res/drawable/notification_header_bg.xml @@ -18,13 +18,13 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true"> <shape> - <solid android:color="#ff54656e" /> + <solid android:color="@color/background_color_1_press" /> <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" /> </shape> </item> <item> <shape> - <solid android:color="#ff384248" /> + <solid android:color="@color/background_color_1" /> <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" /> </shape> </item> diff --git a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml index e6d7c93..0e84762 100644 --- a/packages/SystemUI/res/layout/status_bar_toggle_slider.xml +++ b/packages/SystemUI/res/layout/status_bar_toggle_slider.xml @@ -28,6 +28,7 @@ android:layout_alignParentTop="true" android:layout_alignParentBottom="true" android:button="@null" + android:background="@*android:drawable/switch_track_quantum" /> <com.android.systemui.settings.ToggleSeekBar android:id="@+id/slider" diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index d23a3dc..c1a4e26 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -62,4 +62,8 @@ <!-- The recents task bar dark dismiss icon color to be drawn on top of light backgrounds. --> <color name="recents_task_bar_dark_dismiss_color">#ff333333</color> + <!-- Our quantum color palette (deep teal) --> + <color name="primary_color">#ff7fcac3</color> + <color name="background_color_1">#ff384248</color> + <color name="background_color_1_press">#ff54656e</color> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index acf1f11..4f52870 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -168,7 +168,9 @@ <item name="android:textSize">14dp</item> </style> - <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault" /> + <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault"> + <item name="android:colorPrimary">@color/primary_color</item> + </style> <style name="NotificationsQuickSettings"> <item name="android:layout_width">match_parent</item> |