[Color] Update theme switcher to have customizable text for the description above the radio buttons for choosing color

PiperOrigin-RevId: 355223824

Author: ikim24

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

@@ -33,11 +33,13 @@
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 import androidx.annotation.ArrayRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.annotation.StyleableRes;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
@@ -112,6 +114,8 @@ public View onCreateView(
         resourceProvider.getPrimaryColorsContentDescription(),
         resourceProvider.getPrimaryThemeOverlayAttrs(),
         R.id.theme_feature_primary_color,
+        view.findViewById(R.id.primary_colors_label),
+        resourceProvider.getPrimaryColorsGroupDescription(),
         ThemingType.COLOR);
 
     secondaryColorGroup = view.findViewById(R.id.secondary_colors);
@@ -121,6 +125,8 @@ public View onCreateView(
         resourceProvider.getSecondaryColorsContentDescription(),
         resourceProvider.getSecondaryThemeOverlayAttrs(),
         R.id.theme_feature_secondary_color,
+        view.findViewById(R.id.secondary_colors_label),
+        resourceProvider.getSecondaryColorsGroupDescription(),
         ThemingType.COLOR);
 
     shapeCornerFamilyGroup = view.findViewById(R.id.shape_families);
@@ -129,6 +135,8 @@ public View onCreateView(
         resourceProvider.getShapes(),
         resourceProvider.getShapesContentDescription(),
         R.id.theme_feature_corner_family,
+        view.findViewById(R.id.shape_families_label),
+        resourceProvider.getShapesGroupDescription(),
         ThemingType.SHAPE_CORNER_FAMILY);
 
     shapeCornerSizeGroup = view.findViewById(R.id.shape_corner_sizes);
@@ -137,6 +145,8 @@ public View onCreateView(
         resourceProvider.getShapeSizes(),
         resourceProvider.getShapeSizesContentDescription(),
         R.id.theme_feature_corner_size,
+        view.findViewById(R.id.shape_corner_sizes_label),
+        resourceProvider.getShapeSizesGroupDescription(),
         ThemingType.SHAPE_CORNER_SIZE);
 
     View applyButton = view.findViewById(R.id.apply_button);
@@ -203,9 +213,18 @@ private void initializeThemingValues(
       @ArrayRes int overlays,
       @ArrayRes int contentDescriptions,
       @IdRes int overlayId,
+      TextView groupLabel,
+      @StringRes int groupDescriptionResId,
       ThemingType themingType) {
     initializeThemingValues(
-        group, overlays, contentDescriptions, new int[] {}, overlayId, themingType);
+        group,
+        overlays,
+        contentDescriptions,
+        new int[] {},
+        overlayId,
+        groupLabel,
+        groupDescriptionResId,
+        themingType);
   }
 
   private void initializeThemingValues(
@@ -214,7 +233,11 @@ private void initializeThemingValues(
       @ArrayRes int contentDescriptions,
       @StyleableRes int[] themeOverlayAttrs,
       @IdRes int overlayId,
+      TextView groupLabel,
+      @StringRes int groupDescriptionResId,
       ThemingType themingType) {
+    groupLabel.setText(groupDescriptionResId);
+
     TypedArray themingValues = getResources().obtainTypedArray(overlays);
     TypedArray contentDescriptionArray = getResources().obtainTypedArray(contentDescriptions);
     if (themingValues.length() != contentDescriptionArray.length()) {

catalog/java/io/material/catalog/themeswitcher/ThemeSwitcherResourceProvider.java

@@ -20,6 +20,7 @@
 
 import androidx.annotation.ArrayRes;
 import androidx.annotation.AttrRes;
+import androidx.annotation.StringRes;
 import androidx.annotation.StyleableRes;
 
 /** A helper class that facilitates overriding of theme switcher resources in the Catalog app. */
@@ -67,6 +68,16 @@ public int getSecondaryColorsContentDescription() {
     return R.array.mtrl_palettes_content_description;
   }
 
+  @StringRes
+  public int getPrimaryColorsGroupDescription() {
+    return R.string.mtrl_primary_color_description;
+  }
+
+  @StringRes
+  public int getSecondaryColorsGroupDescription() {
+    return R.string.mtrl_secondary_color_description;
+  }
+
   public int getShapes() {
     return R.array.mtrl_shape_overlays;
   }
@@ -75,11 +86,21 @@ public int getShapesContentDescription() {
     return R.array.mtrl_shapes_content_description;
   }
 
+  @StringRes
+  public int getShapesGroupDescription() {
+    return R.string.mtrl_shape_corner_family;
+  }
+
   public int getShapeSizes() {
     return R.array.mtrl_shape_size_overlays;
   }
 
   public int getShapeSizesContentDescription() {
     return R.array.mtrl_shape_size_content_description;
   }
+
+  @StringRes
+  public int getShapeSizesGroupDescription() {
+    return R.string.mtrl_shape_corner_size;
+  }
 }

catalog/java/io/material/catalog/themeswitcher/res/layout/mtrl_theme_switcher_dialog.xml

@@ -84,7 +84,7 @@
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="\?attr/colorPrimary"/>
+      android:id="@+id/primary_colors_label"/>
   <HorizontalScrollView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="\?attr/colorSecondary"/>
+      android:id="@+id/secondary_colors_label"/>
   <HorizontalScrollView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -123,7 +123,7 @@
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/mtrl_shape_corner_family"/>
+      android:id="@+id/shape_families_label"/>
 
   <RadioGroup
       android:id="@+id/shape_families"
@@ -159,7 +159,7 @@
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/mtrl_shape_corner_size"/>
+      android:id="@+id/shape_corner_sizes_label"/>
 
   <RadioGroup
       android:id="@+id/shape_corner_sizes"

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

@@ -21,6 +21,12 @@
   <string name="mtrl_theme_switcher_cancel">Cancel</string>
   <string name="mtrl_theme_switcher_reset">Reset</string>
 
+  <string name="mtrl_primary_color_description" translatable="false">
+    \?attr/colorPrimary
+  </string>
+  <string name="mtrl_secondary_color_description" translatable="false">
+    \?attr/colorSecondary
+  </string>
   <string name="mtrl_red">Red</string>
   <string name="mtrl_purple">Purple</string>
   <string name="mtrl_indigo">Indigo</string>