From 34c068f702ea215a38543e0efce7169010488488 Mon Sep 17 00:00:00 2001
From: conradchen <conradchen@google.com>
Date: Tue, 2 Nov 2021 14:56:35 -0400
Subject: [PATCH] [M3][Color] Move dynamic color public resources to all
 versions

PiperOrigin-RevId: 407141799
(cherry picked from commit a455a53a6d898fc72df3827dd6434231eda30620)
---
 .../color/res-public/values-v31/public.xml    | 88 -------------------
 .../color/res-public/values/public.xml        | 70 +++++++++++++++
 2 files changed, 70 insertions(+), 88 deletions(-)
 delete mode 100644 lib/java/com/google/android/material/color/res-public/values-v31/public.xml

diff --git a/lib/java/com/google/android/material/color/res-public/values-v31/public.xml b/lib/java/com/google/android/material/color/res-public/values-v31/public.xml
deleted file mode 100644
index e9e8954c211..00000000000
--- a/lib/java/com/google/android/material/color/res-public/values-v31/public.xml
+++ /dev/null
@@ -1,88 +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.
--->
-
-<resources>
-    <public name="material_dynamic_primary0" type="color"/>
-    <public name="material_dynamic_primary10" type="color"/>
-    <public name="material_dynamic_primary20" type="color"/>
-    <public name="material_dynamic_primary30" type="color"/>
-    <public name="material_dynamic_primary40" type="color"/>
-    <public name="material_dynamic_primary50" type="color"/>
-    <public name="material_dynamic_primary60" type="color"/>
-    <public name="material_dynamic_primary70" type="color"/>
-    <public name="material_dynamic_primary80" type="color"/>
-    <public name="material_dynamic_primary90" type="color"/>
-    <public name="material_dynamic_primary95" type="color"/>
-    <public name="material_dynamic_primary99" type="color"/>
-    <public name="material_dynamic_primary100" type="color"/>
-
-    <public name="material_dynamic_secondary0" type="color"/>
-    <public name="material_dynamic_secondary10" type="color"/>
-    <public name="material_dynamic_secondary20" type="color"/>
-    <public name="material_dynamic_secondary30" type="color"/>
-    <public name="material_dynamic_secondary40" type="color"/>
-    <public name="material_dynamic_secondary50" type="color"/>
-    <public name="material_dynamic_secondary60" type="color"/>
-    <public name="material_dynamic_secondary70" type="color"/>
-    <public name="material_dynamic_secondary80" type="color"/>
-    <public name="material_dynamic_secondary90" type="color"/>
-    <public name="material_dynamic_secondary95" type="color"/>
-    <public name="material_dynamic_secondary99" type="color"/>
-    <public name="material_dynamic_secondary100" type="color"/>
-
-    <public name="material_dynamic_tertiary0" type="color"/>
-    <public name="material_dynamic_tertiary10" type="color"/>
-    <public name="material_dynamic_tertiary20" type="color"/>
-    <public name="material_dynamic_tertiary30" type="color"/>
-    <public name="material_dynamic_tertiary40" type="color"/>
-    <public name="material_dynamic_tertiary50" type="color"/>
-    <public name="material_dynamic_tertiary60" type="color"/>
-    <public name="material_dynamic_tertiary70" type="color"/>
-    <public name="material_dynamic_tertiary80" type="color"/>
-    <public name="material_dynamic_tertiary90" type="color"/>
-    <public name="material_dynamic_tertiary95" type="color"/>
-    <public name="material_dynamic_tertiary99" type="color"/>
-    <public name="material_dynamic_tertiary100" type="color"/>
-
-    <public name="material_dynamic_neutral0" type="color"/>
-    <public name="material_dynamic_neutral10" type="color"/>
-    <public name="material_dynamic_neutral20" type="color"/>
-    <public name="material_dynamic_neutral30" type="color"/>
-    <public name="material_dynamic_neutral40" type="color"/>
-    <public name="material_dynamic_neutral50" type="color"/>
-    <public name="material_dynamic_neutral60" type="color"/>
-    <public name="material_dynamic_neutral70" type="color"/>
-    <public name="material_dynamic_neutral80" type="color"/>
-    <public name="material_dynamic_neutral90" type="color"/>
-    <public name="material_dynamic_neutral95" type="color"/>
-    <public name="material_dynamic_neutral99" type="color"/>
-    <public name="material_dynamic_neutral100" type="color"/>
-
-    <public name="material_dynamic_neutral_variant0" type="color"/>
-    <public name="material_dynamic_neutral_variant10" type="color"/>
-    <public name="material_dynamic_neutral_variant20" type="color"/>
-    <public name="material_dynamic_neutral_variant30" type="color"/>
-    <public name="material_dynamic_neutral_variant40" type="color"/>
-    <public name="material_dynamic_neutral_variant50" type="color"/>
-    <public name="material_dynamic_neutral_variant60" type="color"/>
-    <public name="material_dynamic_neutral_variant70" type="color"/>
-    <public name="material_dynamic_neutral_variant80" type="color"/>
-    <public name="material_dynamic_neutral_variant90" type="color"/>
-    <public name="material_dynamic_neutral_variant95" type="color"/>
-    <public name="material_dynamic_neutral_variant99" type="color"/>
-    <public name="material_dynamic_neutral_variant100" type="color"/>
-</resources>
diff --git a/lib/java/com/google/android/material/color/res-public/values/public.xml b/lib/java/com/google/android/material/color/res-public/values/public.xml
index 56c110e995a..d8d5a3ca3f8 100644
--- a/lib/java/com/google/android/material/color/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/color/res-public/values/public.xml
@@ -54,4 +54,74 @@
   <public name="material_emphasis_disabled_background" type="dimen"/>
 
   <public name="useMaterialThemeColors" type="attr"/>
+
+  <public name="material_dynamic_primary0" type="color"/>
+  <public name="material_dynamic_primary10" type="color"/>
+  <public name="material_dynamic_primary20" type="color"/>
+  <public name="material_dynamic_primary30" type="color"/>
+  <public name="material_dynamic_primary40" type="color"/>
+  <public name="material_dynamic_primary50" type="color"/>
+  <public name="material_dynamic_primary60" type="color"/>
+  <public name="material_dynamic_primary70" type="color"/>
+  <public name="material_dynamic_primary80" type="color"/>
+  <public name="material_dynamic_primary90" type="color"/>
+  <public name="material_dynamic_primary95" type="color"/>
+  <public name="material_dynamic_primary99" type="color"/>
+  <public name="material_dynamic_primary100" type="color"/>
+
+  <public name="material_dynamic_secondary0" type="color"/>
+  <public name="material_dynamic_secondary10" type="color"/>
+  <public name="material_dynamic_secondary20" type="color"/>
+  <public name="material_dynamic_secondary30" type="color"/>
+  <public name="material_dynamic_secondary40" type="color"/>
+  <public name="material_dynamic_secondary50" type="color"/>
+  <public name="material_dynamic_secondary60" type="color"/>
+  <public name="material_dynamic_secondary70" type="color"/>
+  <public name="material_dynamic_secondary80" type="color"/>
+  <public name="material_dynamic_secondary90" type="color"/>
+  <public name="material_dynamic_secondary95" type="color"/>
+  <public name="material_dynamic_secondary99" type="color"/>
+  <public name="material_dynamic_secondary100" type="color"/>
+
+  <public name="material_dynamic_tertiary0" type="color"/>
+  <public name="material_dynamic_tertiary10" type="color"/>
+  <public name="material_dynamic_tertiary20" type="color"/>
+  <public name="material_dynamic_tertiary30" type="color"/>
+  <public name="material_dynamic_tertiary40" type="color"/>
+  <public name="material_dynamic_tertiary50" type="color"/>
+  <public name="material_dynamic_tertiary60" type="color"/>
+  <public name="material_dynamic_tertiary70" type="color"/>
+  <public name="material_dynamic_tertiary80" type="color"/>
+  <public name="material_dynamic_tertiary90" type="color"/>
+  <public name="material_dynamic_tertiary95" type="color"/>
+  <public name="material_dynamic_tertiary99" type="color"/>
+  <public name="material_dynamic_tertiary100" type="color"/>
+
+  <public name="material_dynamic_neutral0" type="color"/>
+  <public name="material_dynamic_neutral10" type="color"/>
+  <public name="material_dynamic_neutral20" type="color"/>
+  <public name="material_dynamic_neutral30" type="color"/>
+  <public name="material_dynamic_neutral40" type="color"/>
+  <public name="material_dynamic_neutral50" type="color"/>
+  <public name="material_dynamic_neutral60" type="color"/>
+  <public name="material_dynamic_neutral70" type="color"/>
+  <public name="material_dynamic_neutral80" type="color"/>
+  <public name="material_dynamic_neutral90" type="color"/>
+  <public name="material_dynamic_neutral95" type="color"/>
+  <public name="material_dynamic_neutral99" type="color"/>
+  <public name="material_dynamic_neutral100" type="color"/>
+
+  <public name="material_dynamic_neutral_variant0" type="color"/>
+  <public name="material_dynamic_neutral_variant10" type="color"/>
+  <public name="material_dynamic_neutral_variant20" type="color"/>
+  <public name="material_dynamic_neutral_variant30" type="color"/>
+  <public name="material_dynamic_neutral_variant40" type="color"/>
+  <public name="material_dynamic_neutral_variant50" type="color"/>
+  <public name="material_dynamic_neutral_variant60" type="color"/>
+  <public name="material_dynamic_neutral_variant70" type="color"/>
+  <public name="material_dynamic_neutral_variant80" type="color"/>
+  <public name="material_dynamic_neutral_variant90" type="color"/>
+  <public name="material_dynamic_neutral_variant95" type="color"/>
+  <public name="material_dynamic_neutral_variant99" type="color"/>
+  <public name="material_dynamic_neutral_variant100" type="color"/>
 </resources>