[AppBarLayout] Fix dynamic status bar foreground lift on scroll color…

… when using Tonal Surface Color on API Level 33 Resolves #3530 Resolves #3585 PiperOrigin-RevId: 566609767
material-components · Sep 19, 2023 · c4ae01a · c4ae01a
1 parent 357cf2d
commit c4ae01a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/lib/java/com/google/android/material/appbar/AppBarLayout.java b/lib/java/com/google/android/material/appbar/AppBarLayout.java
@@ -334,8 +334,7 @@ private void initializeLiftOnScrollWithColor(MaterialShapeDrawable background) {
     liftBackground.setAlpha(lifted ? 255 : 0);
     background.setAlpha(lifted ? 0 : 255);
 
-    ColorStateList colorSurface =
-        MaterialColors.getColorStateListOrNull(getContext(), R.attr.colorSurface);
+    Integer colorSurface = MaterialColors.getColorOrNull(getContext(), R.attr.colorSurface);
 
     liftOnScrollColorUpdateListener =
         valueAnimator -> {
@@ -351,8 +350,7 @@ private void initializeLiftOnScrollWithColor(MaterialShapeDrawable background) {
                       liftBackground.getResolvedTintColor());
           if (statusBarForeground != null
               && statusBarForegroundOriginalColor != null
-              && colorSurface != null
-              && statusBarForegroundOriginalColor == colorSurface.getDefaultColor()) {
+              && statusBarForegroundOriginalColor.equals(colorSurface)) {
             DrawableCompat.setTint(statusBarForeground, mixedColor);
           }
 

diff --git a/lib/java/com/google/android/material/color/MaterialColors.java b/lib/java/com/google/android/material/color/MaterialColors.java
@@ -114,12 +114,19 @@ public static int getColor(
   @ColorInt
   public static int getColor(
       @NonNull Context context, @AttrRes int colorAttributeResId, @ColorInt int defaultValue) {
+    Integer color = getColorOrNull(context, colorAttributeResId);
+    return color != null ? color : defaultValue;
+  }
+
+  /**
+   * Returns the color int for the provided theme color attribute, or null if the attribute is not
+   * set in the current theme.
+   */
+  @Nullable
+  @ColorInt
+  public static Integer getColorOrNull(@NonNull Context context, @AttrRes int colorAttributeResId) {
     TypedValue typedValue = MaterialAttributes.resolve(context, colorAttributeResId);
-    if (typedValue != null) {
-      return resolveColor(context, typedValue);
-    } else {
-      return defaultValue;
-    }
+    return typedValue != null ? resolveColor(context, typedValue) : null;
   }
 
   /**