Remove default Theme Switcher color options in favor of Reset option (helps for dark theme)

PiperOrigin-RevId: 219160833

Author: dsn5ft

catalog/java/io/material/catalog/themeswitcher/ThemeSwitcherDialogFragment.java

@@ -64,11 +64,17 @@ public Dialog onCreateDialog(Bundle bundle) {
         .setView(onCreateDialogView(getActivity().getLayoutInflater()))
         .setPositiveButton(
             R.string.mtrl_theme_switcher_save,
-            (dialog, id) -> {
+            (dialog, which) -> {
               dialog.dismiss();
               applyThemeOverlays();
             })
-        .setNegativeButton(R.string.mtrl_theme_switcher_cancel, null);
+        .setNegativeButton(R.string.mtrl_theme_switcher_cancel, null)
+        .setNeutralButton(
+            R.string.mtrl_theme_switcher_reset,
+            (dialog, which) -> {
+              dialog.dismiss();
+              ThemeOverlayUtils.setThemeOverlays(getActivity(), 0, 0);
+            });
     return builder.create();
   }
 
@@ -97,13 +103,18 @@ private View onCreateDialogView(LayoutInflater layoutInflater) {
   }
 
   private void applyThemeOverlays() {
-    ColorPalette primaryPalette =
-        (ColorPalette) getDialog().findViewById(primaryGroup.getCheckedRadioButtonId()).getTag();
-    ColorPalette secondaryPalette =
-        (ColorPalette) getDialog().findViewById(secondaryGroup.getCheckedRadioButtonId()).getTag();
-
     ThemeOverlayUtils.setThemeOverlays(
-        getActivity(), primaryPalette.themeOverlay, secondaryPalette.themeOverlay);
+        getActivity(), getThemeOverlayResId(primaryGroup), getThemeOverlayResId(secondaryGroup));
+  }
+
+  private int getThemeOverlayResId(RadioGroup radioGroup) {
+    if (radioGroup.getCheckedRadioButtonId() == View.NO_ID) {
+      return 0;
+    } else {
+      ColorPalette colorPalette =
+          (ColorPalette) getDialog().findViewById(radioGroup.getCheckedRadioButtonId()).getTag();
+      return colorPalette.themeOverlay;
+    }
   }
 
   private void initializeColors(
@@ -131,7 +142,7 @@ private void initializeColors(
 
       group.addView(button);
 
-      if (palette.themeOverlay == currentThemeOverlay || (i == 0 && currentThemeOverlay == 0)) {
+      if (palette.themeOverlay == currentThemeOverlay) {
         group.check(button.getId());
       }
     }

catalog/java/io/material/catalog/themeswitcher/res/values/arrays.xml

@@ -17,7 +17,6 @@
 <resources>
 
   <array name="mtrl_primary_palettes">
-    <item>@style/ThemeOverlay.PrimaryPalette.Default</item>
     <item>@style/ThemeOverlay.PrimaryPalette.Red</item>
     <item>@style/ThemeOverlay.PrimaryPalette.Purple</item>
     <item>@style/ThemeOverlay.PrimaryPalette.Indigo</item>
@@ -31,7 +30,6 @@
   </array>
 
   <array name="mtrl_secondary_palettes">
-    <item>@style/ThemeOverlay.SecondaryPalette.Default</item>
     <item>@style/ThemeOverlay.SecondaryPalette.Red</item>
     <item>@style/ThemeOverlay.SecondaryPalette.Purple</item>
     <item>@style/ThemeOverlay.SecondaryPalette.Indigo</item>
@@ -45,7 +43,6 @@
   </array>
 
   <array name="mtrl_palettes_content_description">
-    <item>@string/mtrl_default_color</item>
     <item>@string/mtrl_red</item>
     <item>@string/mtrl_purple</item>
     <item>@string/mtrl_indigo</item>

catalog/java/io/material/catalog/themeswitcher/res/values/strings.xml

@@ -19,8 +19,8 @@
   <string name="mtrl_theme_switcher_title">Theme Switcher</string>
   <string name="mtrl_theme_switcher_save">Save</string>
   <string name="mtrl_theme_switcher_cancel">Cancel</string>
+  <string name="mtrl_theme_switcher_reset">Reset</string>
 
-  <string name="mtrl_default_color">Default color</string>
   <string name="mtrl_red">Red</string>
   <string name="mtrl_purple">Purple</string>
   <string name="mtrl_indigo">Indigo</string>

catalog/java/io/material/catalog/themeswitcher/res/values/themes_overlays_primary.xml

@@ -16,11 +16,6 @@
   -->
 <resources>
 
-  <style name="ThemeOverlay.PrimaryPalette.Default" parent="">
-    <item name="colorPrimary">@color/cat_color_primary</item>
-    <item name="colorPrimaryDark">@color/cat_color_primary_dark</item>
-  </style>
-
   <style name="ThemeOverlay.PrimaryPalette.Red" parent="">
     <item name="colorPrimary">#e53935</item>
     <item name="colorPrimaryDark">#ab000d</item>

catalog/java/io/material/catalog/themeswitcher/res/values/themes_overlays_secondary.xml

@@ -16,10 +16,6 @@
   -->
 <resources>
 
-  <style name="ThemeOverlay.SecondaryPalette.Default" parent="">
-    <item name="colorSecondary">@color/cat_color_secondary</item>
-  </style>
-
   <style name="ThemeOverlay.SecondaryPalette.Red" parent="">
     <item name="colorSecondary">#e53935</item>
   </style>