summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Stanley Wang <stanleytfwang@google.com> 2021-01-13 11:17:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-01-13 11:17:16 +0000
commit62eb58b2db3b229e589d98a449b1e3279e1ac300 (patch)
tree30c19281608d7c469b780715c71b6a232150bc3c
parentccd734aceaf362302090f63c733b3dbbd499e8c6 (diff)
parent90089f9e1ee5c63ed30fa5389f4bb02f430b57c7 (diff)
Merge "Update background color of main switch track."
-rw-r--r--packages/SettingsLib/MainSwitchPreference/res/drawable/track_on_background.xml5
-rw-r--r--packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml1
-rw-r--r--packages/SettingsLib/MainSwitchPreference/res/values/colors.xml1
3 files changed, 3 insertions, 4 deletions
diff --git a/packages/SettingsLib/MainSwitchPreference/res/drawable/track_on_background.xml b/packages/SettingsLib/MainSwitchPreference/res/drawable/track_on_background.xml
index 02e3a84957bc..68ce19b6c67f 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/drawable/track_on_background.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/drawable/track_on_background.xml
@@ -20,7 +20,8 @@
android:width="48dp"
android:height="24dp"
android:viewportWidth="48"
- android:viewportHeight="24">
+ android:viewportHeight="24"
+ android:tint="@*android:color/switch_track_material">
<group>
<clip-path
@@ -28,7 +29,7 @@
<path
android:pathData="M0 0V24H48V0"
- android:fillColor="@color/track_on" />
+ android:fillColor="@*android:color/white_disabled_material" />
</group>
</vector>
diff --git a/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml b/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml
index ecbb84acac25..9dc0af3b5643 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/values-night/colors.xml
@@ -19,7 +19,6 @@
<color name="title_text_color">@*android:color/primary_text_dark</color>
<color name="thumb_off">#BFFFFFFF</color>
- <color name="track_on">@*android:color/material_grey_600</color>
<color name="track_off">@*android:color/material_grey_600</color>
</resources>
diff --git a/packages/SettingsLib/MainSwitchPreference/res/values/colors.xml b/packages/SettingsLib/MainSwitchPreference/res/values/colors.xml
index ac8ab14738e9..8194bddc99b4 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/values/colors.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/values/colors.xml
@@ -19,7 +19,6 @@
<color name="title_text_color">@*android:color/primary_text_light</color>
<color name="thumb_off">#BFFFFFFF</color>
- <color name="track_on">@*android:color/accent_device_default_dark</color>
<color name="track_off">@*android:color/material_grey_600</color>
</resources>