Set primary color of SystemUI.
Also fixes the weird color of the auto-brightness toggle.
Change-Id: I7d8a2a47d630c3ca910983158fbf80ed739e0326
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>
diff --git a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
index 7d38058..4b78072 100644
--- a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
+++ b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java
@@ -62,7 +62,6 @@
mToggle = (CompoundButton) findViewById(R.id.toggle);
mToggle.setOnCheckedChangeListener(mCheckListener);
- mToggle.setBackground(res.getDrawable(R.drawable.status_bar_toggle_button));
mSlider = (SeekBar) findViewById(R.id.slider);
mSlider.setOnSeekBarChangeListener(mSeekListener);