Remove CSL theme attribute workarounds

Also update androidx dependencies to get latest fixes: appcompat to 1.1.0-alpha04 and core to 1.1.0-alpha05

PiperOrigin-RevId: 246804285

Author: dsn5ft

build.gradle

@@ -26,10 +26,10 @@ ext {
 
   androidXVersions = [
     annotation            : '1.0.1',
-    appCompat             : '1.1.0-alpha01',
+    appCompat             : '1.1.0-alpha04',
     cardView              : '1.0.0',
     coordinatorlayout     : '1.1.0-alpha01',
-    core                  : '1.1.0-alpha03',
+    core                  : '1.1.0-alpha05',
     fragment              : '1.0.0',
     legacySupportCoreUi   : '1.0.0',
     legacySupportCoreUtils: '1.0.0',

catalog/java/io/material/catalog/card/res/layout/cat_card_rich_media_demo_fragment.xml

@@ -81,7 +81,7 @@
               android:layout_marginLeft="@dimen/cat_card_single_spacing"
               android:background="@android:color/transparent"
               android:contentDescription="@string/cat_card_rich_media_image_view_description"
-              app:backgroundTint="?attr/colorOnSurfaceEmphasisMedium"
+              app:backgroundTint="@color/mtrl_on_surface_emphasis_medium"
               app:backgroundTintMode="add"
               app:srcCompat="@drawable/ic_components_24px"/>
         </LinearLayout>
@@ -178,7 +178,7 @@
             android:layout_height="194dp"
             android:background="@android:color/transparent"
             android:contentDescription="@string/cat_card_rich_media_image_view_description"
-            app:backgroundTint="?attr/colorOnSurfaceEmphasisMedium"
+            app:backgroundTint="@color/mtrl_on_surface_emphasis_medium"
             app:backgroundTintMode="add"
             app:srcCompat="@drawable/ic_components_24px"/>
 
@@ -243,7 +243,7 @@
             android:layout_height="194dp"
             android:background="@android:color/transparent"
             android:contentDescription="@string/cat_card_rich_media_image_view_description"
-            app:backgroundTint="?attr/colorOnSurfaceEmphasisMedium"
+            app:backgroundTint="@color/mtrl_on_surface_emphasis_medium"
             app:backgroundTintMode="add"
             app:srcCompat="@drawable/ic_components_24px"/>
 

catalog/java/io/material/catalog/feature/DemoLandingFragment.java

@@ -18,6 +18,7 @@
 
 import io.material.catalog.R;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
@@ -27,6 +28,7 @@
 import androidx.annotation.DimenRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import com.google.android.material.resources.MaterialResources;
 import androidx.fragment.app.Fragment;
 import androidx.core.view.MarginLayoutParamsCompat;
 import androidx.core.view.MenuItemCompat;
@@ -57,6 +59,7 @@ public void onCreate(@Nullable Bundle bundle) {
     setHasOptionsMenu(true);
   }
 
+  @SuppressWarnings("RestrictTo")
   @Nullable
   @Override
   public View onCreateView(
@@ -72,12 +75,13 @@ public View onCreateView(
     activity.getSupportActionBar().setTitle(getTitleResId());
     activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+    Context toolbarContext = toolbar.getContext();
     TypedArray a =
-        toolbar
-            .getContext()
+        toolbarContext
             .getTheme()
             .obtainStyledAttributes(new int[] {R.attr.colorControlNormal, R.attr.colorAccent});
-    colorControlNormal = a.getColor(0, 0);
+    colorControlNormal =
+        MaterialResources.getColorStateList(toolbarContext, a, 0).getDefaultColor();
     colorAccent = a.getColor(1, 0);
 
     TextView descriptionTextView = view.findViewById(R.id.cat_demo_landing_description);

lib/java/com/google/android/material/appbar/res/values/styles.xml

@@ -53,34 +53,19 @@
     <item name="maxButtonHeight">@dimen/mtrl_toolbar_default_height</item>
   </style>
 
-  <!--
-    We are currently waiting for better attribute support in ColorStateLists to land in the support
-    library. https://android-review.googlesource.com/757091. Because we can't fully support color
-    theming on all API levels for the Toolbar Primary and Surface styles, we are requiring you to
-    opt in for now.
-
-    As a workaround to enable correct color theming in your app for API < 23, in addition to setting
-    the colorOnPrimary and colorOnSurface attributes in your theme, redefine these color resources
-    to match with the correct opacity. For example, if you set the colorOnPrimary attribute in your
-    theme to red (#FF0000). You should redefine mtrl_on_primary_disabled to be #61FF000,
-    mtrl_on_primary_emphasis_high_type to be #DEFF0000, and mtrl_on_primary_emphasis_medium to be
-    #99FF0000. That sets the color values to be the correct color and opacity to match the correct
-    color theming that will be applied on API level 23 and up. When the bugs are fixed in the
-    support library you can remove these color definitions.
-  -->
   <style name="Widget.MaterialComponents.Toolbar.Primary">
     <item name="android:elevation" tools:ignore="NewApi">@dimen/design_appbar_elevation</item>
     <item name="android:background">?attr/colorPrimary</item>
     <item name="titleTextColor">?attr/colorOnPrimary</item>
-    <item name="subtitleTextColor">?attr/colorOnPrimaryEmphasisMedium</item>
+    <item name="subtitleTextColor">@color/mtrl_on_primary_emphasis_medium</item>
     <!-- Note: this theme overlay will only work if the style is applied directly to a Toolbar. -->
     <item name="android:theme">@style/ThemeOverlay.MaterialComponents.Toolbar.Primary</item>
   </style>
 
   <style name="Widget.MaterialComponents.Toolbar.Surface">
     <item name="android:background">?attr/colorSurface</item>
-    <item name="titleTextColor">?attr/colorOnSurfaceEmphasisHighType</item>
-    <item name="subtitleTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
+    <item name="titleTextColor">@color/mtrl_on_surface_emphasis_high_type</item>
+    <item name="subtitleTextColor">@color/mtrl_on_surface_emphasis_medium</item>
     <!-- Note: this theme overlay will only work if the style is applied directly to a Toolbar. -->
     <item name="android:theme">@style/ThemeOverlay.MaterialComponents.Toolbar.Surface</item>
   </style>
@@ -91,8 +76,8 @@
   </style>
 
   <style name="ThemeOverlay.MaterialComponents.Toolbar.Surface" parent="">
-    <item name="colorControlNormal">?attr/colorOnSurfaceEmphasisMedium</item>
-    <item name="actionMenuTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
+    <item name="colorControlNormal">@color/mtrl_on_surface_emphasis_medium</item>
+    <item name="actionMenuTextColor">@color/mtrl_on_surface_emphasis_medium</item>
   </style>
 
   <!-- ActionBar styles -->
@@ -124,7 +109,7 @@
 
   <style name="ThemeOverlay.MaterialComponents.ActionBar.Primary" parent="">
     <item name="android:textColorPrimary">?attr/colorOnPrimary</item>
-    <item name="android:textColorSecondary">?attr/colorOnPrimaryEmphasisMedium</item>
+    <item name="android:textColorSecondary">@color/mtrl_on_primary_emphasis_medium</item>
     <item name="actionMenuTextColor">?attr/colorOnPrimary</item>
     <item name="colorControlNormal">?attr/colorOnPrimary</item>
     <!-- Counteracts the effect of setting textColorPrimary for popup menus. -->
@@ -134,10 +119,10 @@
   </style>
 
   <style name="ThemeOverlay.MaterialComponents.ActionBar.Surface" parent="">
-    <item name="android:textColorPrimary">?attr/colorOnSurfaceEmphasisHighType</item>
-    <item name="android:textColorSecondary">?attr/colorOnSurfaceEmphasisMedium</item>
-    <item name="actionMenuTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
-    <item name="colorControlNormal">?attr/colorOnSurfaceEmphasisMedium</item>
+    <item name="android:textColorPrimary">@color/mtrl_on_surface_emphasis_high_type</item>
+    <item name="android:textColorSecondary">@color/mtrl_on_surface_emphasis_medium</item>
+    <item name="actionMenuTextColor">@color/mtrl_on_surface_emphasis_medium</item>
+    <item name="colorControlNormal">@color/mtrl_on_surface_emphasis_medium</item>
     <!-- Counteracts the effect of setting textColorPrimary for popup menus. -->
     <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     <!-- Used to tint the ActionMode background and preserve the underline. -->

lib/java/com/google/android/material/bottomappbar/BottomAppBar.java

@@ -85,19 +85,6 @@
  * because the BottomAppBar manages its background internally. Instead use {@code
  * app:backgroundTint}.
  *
- * <p>We are currently waiting for better attribute support in ColorStateLists to land in the
- * support library. https://android-review.googlesource.com/757091. Because we can't fully support
- * color theming on all API levels for the BottomAppBar, to use the default theme, we are requiring
- * you to opt in for now.
- *
- * <p>As a workaround to enable correct color theming in your app for API < 23, in addition to
- * setting the colorOnSurface attribute in your theme, redefine {@code
- * mtrl_on_surface_emphasis_medium} to match with the correct opacity. For example, if you set
- * {@code colorOnSurface} in your theme to red (#FF0000). You should redefine {@code
- * mtrl_on_surface_emphasis_medium} to be #99FF0000. This sets the color value to be the correct
- * color and opacity to match the correct color theming that will be applied on API level 23 and up.
- * When the bugs are fixed in the support library you can remove these color definitions.
- *
  * <p>To enable color theming for menu items you will also need to set the {@code
  * materialThemeOverlay} attribute to a ThemeOverlay which sets the {@code colorControlNormal}
  * attribute to the correct color. For example, if the background of the BottomAppBar is {@code

lib/java/com/google/android/material/bottomappbar/res/values/styles.xml

@@ -15,19 +15,7 @@
   ~ limitations under the License.
 -->
 <resources>
-  <!--
-    We are currently waiting for better attribute support in ColorStateLists to land in the support
-    library. https://android-review.googlesource.com/757091. Because we can't fully support color
-    theming on all API levels for the BottomAppBar, we are requiring you to opt in for now.
 
-    As a workaround to enable correct color theming in your app for API < 23 if you are using this
-    style, in addition to setting the colorOnSurface attributes in your theme, redefine
-    mtrl_on_surface_emphasis_medium to match with the correct opacity. For example, if you set the
-    colorOnSurface attribute in your theme to red (#FF0000). You should redefine
-    mtrl_on_surface_emphasis_medium to be #99FF0000. This sets the color value to be the correct
-    color and opacity to match the correct color theming that will be applied on API level 23 and
-    up. When the bugs are fixed in the support library you can remove this color definition.
-  -->
   <style name="Widget.MaterialComponents.BottomAppBar" parent="Widget.AppCompat.Toolbar">
     <item name="enforceMaterialTheme">true</item>
     <item name="backgroundTint">?attr/colorSurface</item>
@@ -47,8 +35,8 @@
   </style>
 
   <style name="ThemeOverlay.MaterialComponents.BottomAppBar.Surface" parent="">
-    <item name="colorControlNormal">?attr/colorOnSurfaceEmphasisMedium</item>
-    <item name="actionMenuTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
+    <item name="colorControlNormal">@color/mtrl_on_surface_emphasis_medium</item>
+    <item name="actionMenuTextColor">@color/mtrl_on_surface_emphasis_medium</item>
   </style>
 
   <style name="ThemeOverlay.MaterialComponents.BottomAppBar.Primary" parent="">

lib/java/com/google/android/material/color/res-public/values/public.xml

@@ -42,12 +42,6 @@
   <public name="mtrl_on_surface_disabled" type="color"/>
   <public name="mtrl_on_surface_emphasis_high_type" type="color"/>
   <public name="mtrl_on_surface_emphasis_medium" type="color"/>
-  <public name="mtrl_dark_on_primary_disabled" type="color"/>
-  <public name="mtrl_dark_on_primary_emphasis_high_type" type="color"/>
-  <public name="mtrl_dark_on_primary_emphasis_medium" type="color"/>
-  <public name="mtrl_dark_on_surface_disabled" type="color"/>
-  <public name="mtrl_dark_on_surface_emphasis_high_type" type="color"/>
-  <public name="mtrl_dark_on_surface_emphasis_medium" type="color"/>
   <public name="mtrl_emphasis_high_type" format="float" type="dimen" />
   <public name="mtrl_emphasis_medium" format="float" type="dimen"/>
   <public name="mtrl_emphasis_disabled" format="float" type="dimen"/>