OmniPreferenceTheme: make all resource names unique to prevent name clashes
Change-Id: I35614bf8c6f56fe07f6cc343a4de98af83e09a2b
diff --git a/themes/PreferenceTheme/res/color-v31/home_settings_switch_thumb_color.xml b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_thumb_color.xml
similarity index 82%
rename from themes/PreferenceTheme/res/color-v31/home_settings_switch_thumb_color.xml
rename to themes/PreferenceTheme/res/color-v31/omni_settings_switch_thumb_color.xml
index 91d3d9b..0a8cdd9 100644
--- a/themes/PreferenceTheme/res/color-v31/home_settings_switch_thumb_color.xml
+++ b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_thumb_color.xml
@@ -18,10 +18,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Disabled status of thumb -->
<item android:state_enabled="false"
- android:color="@color/home_settings_thumb_off_color" />
+ android:color="@color/omni_settings_thumb_disabled_color" />
<!-- Toggle off status of thumb -->
<item android:state_checked="false"
- android:color="@color/home_settings_thumb_off_color" />
+ android:color="@color/omni_settings_thumb_off_color" />
<!-- Enabled or toggle on status of thumb -->
- <item android:color="@color/home_settings_state_on_color" />
+ <item android:color="@color/omni_settings_state_on_color" />
</selector>
diff --git a/themes/PreferenceTheme/res/color-v31/home_settings_switch_track_color.xml b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_color.xml
similarity index 84%
rename from themes/PreferenceTheme/res/color-v31/home_settings_switch_track_color.xml
rename to themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_color.xml
index 50784f5..92561d9 100644
--- a/themes/PreferenceTheme/res/color-v31/home_settings_switch_track_color.xml
+++ b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_color.xml
@@ -18,11 +18,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Disabled status of thumb -->
<item android:state_enabled="false"
- android:color="@color/home_settings_track_off_color"
+ android:color="@color/omni_settings_track_off_color"
android:alpha="?android:attr/disabledAlpha" />
<!-- Toggle off status of thumb -->
<item android:state_checked="false"
- android:color="@color/home_settings_track_off_color" />
+ android:color="@color/omni_settings_track_off_color" />
<!-- Enabled or toggle on status of thumb -->
- <item android:color="@color/home_settings_track_on_color" />
+ <item android:color="@color/omni_settings_track_on_color" />
</selector>
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
new file mode 100644
index 0000000..762bb31
--- /dev/null
+++ b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_off.xml
@@ -0,0 +1,19 @@
+<?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
new file mode 100644
index 0000000..81ddf29
--- /dev/null
+++ b/themes/PreferenceTheme/res/color-v31/omni_settings_switch_track_on.xml
@@ -0,0 +1,20 @@
+<?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/drawable-v31/home_settings_switch_thumb.xml b/themes/PreferenceTheme/res/drawable-v31/omni_settings_switch_thumb.xml
similarity index 93%
rename from themes/PreferenceTheme/res/drawable-v31/home_settings_switch_thumb.xml
rename to themes/PreferenceTheme/res/drawable-v31/omni_settings_switch_thumb.xml
index 260d5ea..9074d89 100644
--- a/themes/PreferenceTheme/res/drawable-v31/home_settings_switch_thumb.xml
+++ b/themes/PreferenceTheme/res/drawable-v31/omni_settings_switch_thumb.xml
@@ -23,7 +23,7 @@
android:bottom="4dp">
<shape android:shape="oval" >
<size android:height="20dp" android:width="20dp" />
- <solid android:color="@color/home_settings_switch_thumb_color" />
+ <solid android:color="@color/omni_settings_switch_thumb_color" />
</shape>
</item>
</layer-list>
\ No newline at end of file
diff --git a/themes/PreferenceTheme/res/drawable-v31/home_settings_switch_track.xml b/themes/PreferenceTheme/res/drawable-v31/omni_settings_switch_track.xml
similarity index 93%
rename from themes/PreferenceTheme/res/drawable-v31/home_settings_switch_track.xml
rename to themes/PreferenceTheme/res/drawable-v31/omni_settings_switch_track.xml
index 502a300..532c254 100644
--- a/themes/PreferenceTheme/res/drawable-v31/home_settings_switch_track.xml
+++ b/themes/PreferenceTheme/res/drawable-v31/omni_settings_switch_track.xml
@@ -21,6 +21,6 @@
android:width="52dp"
android:height="28dp">
- <solid android:color="@color/home_settings_switch_track_color" />
+ <solid android:color="@color/omni_settings_switch_track_color" />
<corners android:radius="35dp" />
</shape>
\ 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 dacc537..400bc84 100644
--- a/themes/PreferenceTheme/res/values-night-v31/colors.xml
+++ b/themes/PreferenceTheme/res/values-night-v31/colors.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="home_settings_thumb_off_color">@android:color/system_neutral2_300</color>
- <color name="home_settings_track_on_color">@android:color/system_accent2_700</color>
- <color name="home_settings_track_off_color">@android:color/system_neutral1_700</color>
+ <!-- Material next thumb disable color-->
+ <color name="omni_settings_thumb_disabled_color">@android:color/system_neutral1_700</color>
+
+ <!-- Material next thumb off color-->
+ <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>
+
+ <!-- Material next track off color-->
+ <color name="omni_settings_track_off_color">@android:color/system_neutral1_700</color>
</resources>
\ No newline at end of file
diff --git a/themes/PreferenceTheme/res/values-v31/colors.xml b/themes/PreferenceTheme/res/values-v31/colors.xml
index 4d49ca1..be1de09 100644
--- a/themes/PreferenceTheme/res/values-v31/colors.xml
+++ b/themes/PreferenceTheme/res/values-v31/colors.xml
@@ -1,7 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="home_settings_thumb_off_color">@android:color/system_neutral2_100</color>
- <color name="home_settings_track_on_color">@android:color/system_accent1_600</color>
- <color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>
- <color name="home_settings_state_on_color">@android:color/system_accent1_100</color>
+<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>
+
+ <!-- Material next track on color-->
+ <color name="omni_settings_track_on_color">@android:color/system_accent1_600</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
diff --git a/themes/PreferenceTheme/res/values-v31/config.xml b/themes/PreferenceTheme/res/values-v31/config.xml
index 81a078e..f5db48c 100644
--- a/themes/PreferenceTheme/res/values-v31/config.xml
+++ b/themes/PreferenceTheme/res/values-v31/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <bool name="home_settings_icon_space_reserved">false</bool>
- <bool name="home_settings_config_allow_divider">false</bool>
+ <bool name="omni_settings_icon_space_reserved">false</bool>
+ <bool name="omni_settings_config_allow_divider">false</bool>
</resources>
\ No newline at end of file
diff --git a/themes/PreferenceTheme/res/values-v31/dimens.xml b/themes/PreferenceTheme/res/values-v31/dimens.xml
index f7e777b..9b85225 100644
--- a/themes/PreferenceTheme/res/values-v31/dimens.xml
+++ b/themes/PreferenceTheme/res/values-v31/dimens.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <dimen name="pref_title_text_size">18sp</dimen>
+ <dimen name="omni_pref_title_text_size">18sp</dimen>
</resources>
diff --git a/themes/PreferenceTheme/res/values-v31/styles_preference.xml b/themes/PreferenceTheme/res/values-v31/styles_preference.xml
index 4415003..a460fb4 100644
--- a/themes/PreferenceTheme/res/values-v31/styles_preference.xml
+++ b/themes/PreferenceTheme/res/values-v31/styles_preference.xml
@@ -13,57 +13,57 @@
</style>
<style name="Omni.CategoryStyle" parent="@style/Preference.Category.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
- <item name="allowDividerAbove">@bool/home_settings_config_allow_divider</item>
- <item name="allowDividerBelow">@bool/home_settings_config_allow_divider</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
+ <item name="allowDividerAbove">@bool/omni_settings_config_allow_divider</item>
+ <item name="allowDividerBelow">@bool/omni_settings_config_allow_divider</item>
</style>
<style name="Omni.PreferenceStyle" parent="@style/Preference.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
</style>
<style name="Omni.PreferenceScreenStyle"
parent="@style/Preference.PreferenceScreen.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
</style>
<style name="Omni.SwitchPreferenceStyle"
parent="@style/Preference.SwitchPreference.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
</style>
<style name="Omni.CheckboxPreferenceStyle"
parent="@style/Preference.CheckBoxPreference.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
</style>
<style name="Omni.DropDownPreferenceStyle"
parent="@style/Preference.DropDown.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
</style>
<style name="Omni.DialogPreferenceStyle"
parent="@style/Preference.DialogPreference.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
</style>
<style name="Omni.EditTextPreferenceStyle"
parent="@style/Preference.DialogPreference.EditTextPreference.Material">
- <item name="iconSpaceReserved">@bool/home_settings_icon_space_reserved</item>
- <item name="allowDividerAbove">@bool/home_settings_config_allow_divider</item>
- <item name="allowDividerBelow">@bool/home_settings_config_allow_divider</item>
+ <item name="iconSpaceReserved">@bool/omni_settings_icon_space_reserved</item>
+ <item name="allowDividerAbove">@bool/omni_settings_config_allow_divider</item>
+ <item name="allowDividerBelow">@bool/omni_settings_config_allow_divider</item>
</style>
<style name="Omni.SwitchStyle"
parent="@android:style/Widget.Material.CompoundButton.Switch">
<item name="android:switchMinWidth">52dp</item>
- <item name="android:thumb">@drawable/home_settings_switch_thumb</item>
- <item name="android:track">@drawable/home_settings_switch_track</item>
+ <item name="android:thumb">@drawable/omni_settings_switch_thumb</item>
+ <item name="android:track">@drawable/omni_settings_switch_track</item>
</style>
<style name="Omni.PreferenceTitle"
parent="@style/TextAppearance.Material3.BodyMedium">
- <item name="android:textSize">@dimen/pref_title_text_size</item>
+ <item name="android:textSize">@dimen/omni_pref_title_text_size</item>
</style>
<style name="Omni.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">