OmniPreferenceTheme: use same track_on_color for light and dark
we made the settingslib do it the same in
8c6867551ab38f45c161584a6d68d3ccf3918fbf
also cleanup uneeded things that only makes it more
complicated and confusing
Change-Id: Ic36e52ebf2f2ffef4c35091a0feb9de40045cbc8
diff --git a/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_off.xml b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_off.xml
deleted file mode 100644
index 762bb31..0000000
--- a/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_off.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@android:color/system_neutral2_500" android:lStar="45" />
-</selector>
\ No newline at end of file
diff --git a/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_on.xml b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_on.xml
deleted file mode 100644
index 81ddf29..0000000
--- a/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_on.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@android:color/system_accent2_500" android:lStar="51" />
-</selector>
\ No newline at end of file
diff --git a/themes/PreferenceTheme/res/values-night-v31/colors.xml b/themes/PreferenceTheme/res/values-night-v31/colors.xml
index 400bc84..b342868 100644
--- a/themes/PreferenceTheme/res/values-night-v31/colors.xml
+++ b/themes/PreferenceTheme/res/values-night-v31/colors.xml
@@ -7,7 +7,7 @@
<color name="omni_settings_thumb_off_color">@android:color/system_neutral1_400</color>
<!-- Material next track on color-->
- <color name="omni_settings_track_on_color">@color/omni_settings_switch_track_on</color>
+ <color name="omni_settings_track_on_color">@android:color/system_accent2_500</color>
<!-- Material next track off color-->
<color name="omni_settings_track_off_color">@android:color/system_neutral1_700</color>
diff --git a/themes/PreferenceTheme/res/values-v31/colors.xml b/themes/PreferenceTheme/res/values-v31/colors.xml
index be1de09..9c343c2 100644
--- a/themes/PreferenceTheme/res/values-v31/colors.xml
+++ b/themes/PreferenceTheme/res/values-v31/colors.xml
@@ -2,18 +2,15 @@
<resources>
<color name="omni_settings_state_on_color">@android:color/system_accent1_100</color>
- <!-- Material next state off color-->
- <color name="omni_settings_state_off_color">@android:color/system_accent2_100</color>
-
<!-- Material next thumb disable color-->
<color name="omni_settings_thumb_disabled_color">@android:color/system_neutral2_100</color>
<!-- Material next thumb off color-->
- <color name="omni_settings_thumb_off_color">@android:color/system_neutral2_300</color>
+ <color name="omni_settings_thumb_off_color">@android:color/system_neutral2_100</color>
<!-- Material next track on color-->
- <color name="omni_settings_track_on_color">@android:color/system_accent1_600</color>
+ <color name="omni_settings_track_on_color">@android:color/system_accent2_500</color>
<!-- Material next track off color-->
- <color name="omni_settings_track_off_color">@color/omni_settings_switch_track_off</color>
-</resources>
\ No newline at end of file
+ <color name="omni_settings_track_off_color">@android:color/system_neutral2_500</color>
+</resources>