From 90089f9e1ee5c63ed30fa5389f4bb02f430b57c7 Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Tue, 12 Jan 2021 22:53:55 +0800
Subject: [PATCH] Update background color of main switch track.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie5bdb40a5cc1be17b6ebdb910dfbbaeb4042fb39
---
 .../res/drawable/track_on_background.xml                     | 5 +++--
 .../MainSwitchPreference/res/values-night/colors.xml         | 1 -
 .../SettingsLib/MainSwitchPreference/res/values/colors.xml   | 1 -
 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 02e3a84957bcd..68ce19b6c67fc 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 ecbb84acac25d..9dc0af3b56439 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 ac8ab14738e9a..8194bddc99b4b 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>