[M3][Color] Enable Resources Harmonization with Material defaults in Catalog app.

PiperOrigin-RevId: 430775729

Author: Material Design Team

catalog/java/io/material/catalog/color/res/layout/cat_colors_fragment.xml

@@ -24,53 +24,68 @@
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
+    android:orientation="vertical">
 
     <LinearLayout
-      android:layout_width="0dp"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:padding="8dp"
-      android:layout_weight="1">
+      android:orientation="horizontal"
+      android:baselineAligned="false">
 
       <LinearLayout
-        android:id="@+id/cat_colors_surfaces"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="8dp"
+        android:layout_weight="1">
 
-        <TextView
+        <LinearLayout
+          android:id="@+id/cat_colors_surfaces"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical">
+
+          <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:text="@string/cat_color_surfaces" />
+        </LinearLayout>
+
+        <LinearLayout
+          android:id="@+id/cat_colors_utility"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="@string/cat_color_surfaces" />
+          android:orientation="vertical">
+
+          <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="8dp"
+            android:text="@string/cat_color_utility" />
+        </LinearLayout>
       </LinearLayout>
 
       <LinearLayout
-        android:id="@+id/cat_colors_utility"
-        android:layout_width="match_parent"
+        android:id="@+id/cat_colors_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="8dp"
+        android:layout_weight="1">
 
         <TextView
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:text="@string/cat_color_utility" />
+          android:paddingBottom="8dp"
+          android:text="@string/cat_color_content" />
       </LinearLayout>
     </LinearLayout>
 
-    <LinearLayout
-      android:id="@+id/cat_colors_content"
-      android:layout_width="0dp"
+    <TextView
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="vertical"
       android:padding="8dp"
-      android:layout_weight="1">
-
-      <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/cat_color_content" />
-    </LinearLayout>
+      android:text="@string/cat_color_utility_note" />
   </LinearLayout>
 </ScrollView>

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

@@ -47,6 +47,7 @@
   <string name="cat_color_surfaces" translatable="false">Surfaces</string>
   <string name="cat_color_utility" translatable="false">Utility</string>
   <string name="cat_color_content" translatable="false">Content</string>
+  <string name="cat_color_utility_note" translatable="false">Note: When dynamic color is enabled, the Error color roles will look different from baseline because they will be harmonized with Primary by default.</string>
 
   <string name="cat_color_role_primary" translatable="false">Primary</string>
   <string name="cat_color_role_on_primary" translatable="false">On Primary</string>

catalog/java/io/material/catalog/preferences/DynamicColorPreference.java

@@ -23,6 +23,9 @@
 import androidx.annotation.NonNull;
 import com.google.android.material.color.DynamicColors;
 import com.google.android.material.color.DynamicColors.Precondition;
+import com.google.android.material.color.DynamicColorsOptions;
+import com.google.android.material.color.HarmonizedColors;
+import com.google.android.material.color.HarmonizedColorsOptions;
 import com.google.common.collect.ImmutableList;
 
 /** Dynamic color preference to enable/disable dynamic colors. */
@@ -75,13 +78,24 @@ protected void apply(@NonNull Context context, @NonNull Option selectedOption) {
     isOptionOn = selectedOption.id == OPTION_ID_ON;
     if (isOptionOn && !isApplied) {
       isApplied = true;
-      DynamicColors.applyToActivitiesIfAvailable(
-          (Application) context.getApplicationContext(), precondition);
+      // TODO(b/221246424): Add preference option to turn on/off the color harmonization.
+      applyDynamicColorsWithMaterialDefaultHarmonization(context);
     }
   }
 
   @Override
   protected boolean shouldRecreateActivityOnOptionChanged() {
     return true;
   }
+
+  private void applyDynamicColorsWithMaterialDefaultHarmonization(@NonNull Context context) {
+    DynamicColors.applyIfAvailable(
+        new DynamicColorsOptions.Builder((Application) context.getApplicationContext())
+            .setPrecondition(precondition)
+            .setOnAppliedCallback(
+                activity ->
+                    HarmonizedColors.applyIfAvailable(
+                        HarmonizedColorsOptions.createMaterialDefaults(activity)))
+            .build());
+  }
 }