Add convenience method to check if VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2 in BadgeUtils.

PiperOrigin-RevId: 249855393

Author: wcshi

lib/java/com/google/android/material/badge/BadgeDrawable.java

@@ -30,8 +30,6 @@
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.AttrRes;
@@ -579,7 +577,7 @@ private void calculateBadgeCenterCoordinates(
     // Returns the visible bounds of the anchor view.
     anchorView.getDrawingRect(anchorRect);
     anchorRect.top += res.getDimensionPixelSize(R.dimen.mtrl_badge_vertical_offset);
-    if (customBadgeParent != null || VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2) {
+    if (customBadgeParent != null || BadgeUtils.USE_COMPAT_PARENT) {
       // Calculates coordinates relative to the parent.
       ViewGroup viewGroup =
           customBadgeParent == null ? (ViewGroup) anchorView.getParent() : customBadgeParent;

lib/java/com/google/android/material/badge/BadgeUtils.java

@@ -38,6 +38,8 @@
 @RestrictTo(Scope.LIBRARY)
 public class BadgeUtils {
 
+  public static final boolean USE_COMPAT_PARENT = VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2;
+
   private BadgeUtils() {
     // Private constructor to prevent unwanted construction.
   }
@@ -68,10 +70,10 @@ public static void updateBadgeBounds(
    * ancestor of the anchor.
    */
   public static void attachBadgeDrawable(
-      BadgeDrawable badgeDrawable, View anchor, FrameLayout preApi18BadgeParent) {
-    setBadgeDrawableBounds(badgeDrawable, anchor, preApi18BadgeParent);
-    if (VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2) {
-      preApi18BadgeParent.setForeground(badgeDrawable);
+      BadgeDrawable badgeDrawable, View anchor, FrameLayout compatBadgeParent) {
+    setBadgeDrawableBounds(badgeDrawable, anchor, compatBadgeParent);
+    if (USE_COMPAT_PARENT) {
+      compatBadgeParent.setForeground(badgeDrawable);
     } else {
       anchor.getOverlay().add(badgeDrawable);
     }
@@ -84,12 +86,12 @@ public static void attachBadgeDrawable(
    * an ancestor of the anchor.
    */
   public static void detachBadgeDrawable(
-      @Nullable BadgeDrawable badgeDrawable, View anchor, FrameLayout preApi18BadgeParent) {
+      @Nullable BadgeDrawable badgeDrawable, View anchor, FrameLayout compatBadgeParent) {
     if (badgeDrawable == null) {
       return;
     }
-    if (VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2) {
-      preApi18BadgeParent.setForeground(null);
+    if (USE_COMPAT_PARENT) {
+      compatBadgeParent.setForeground(null);
     } else {
       anchor.getOverlay().remove(badgeDrawable);
     }
@@ -100,15 +102,12 @@ public static void detachBadgeDrawable(
    * anchor's FrameLayout ancestor (pre-API 18).
    */
   public static void setBadgeDrawableBounds(
-      BadgeDrawable badgeDrawable, View anchor, FrameLayout preApi18BadgeParent) {
+      BadgeDrawable badgeDrawable, View anchor, FrameLayout compatBadgeParent) {
     Rect badgeBounds = new Rect();
-    if (VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2) {
-      preApi18BadgeParent.getDrawingRect(badgeBounds);
-    } else {
-      anchor.getDrawingRect(badgeBounds);
-    }
+    View badgeParent = USE_COMPAT_PARENT ? compatBadgeParent : anchor;
+    badgeParent.getDrawingRect(badgeBounds);
     badgeDrawable.setBounds(badgeBounds);
-    badgeDrawable.updateBadgeCoordinates(anchor, preApi18BadgeParent);
+    badgeDrawable.updateBadgeCoordinates(anchor, compatBadgeParent);
   }
 
   /**

lib/java/com/google/android/material/bottomnavigation/BottomNavigationItemView.java

@@ -24,8 +24,6 @@
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
@@ -453,9 +451,7 @@ private void tryRemoveBadgeFromAnchor(View anchorView) {
   @Nullable
   private FrameLayout getCustomParentForBadge(View anchorView) {
     if (anchorView == icon) {
-      return (VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN_MR2)
-          ? ((FrameLayout) icon.getParent())
-          : null;
+      return BadgeUtils.USE_COMPAT_PARENT ? ((FrameLayout) icon.getParent()) : null;
     }
     // TODO: Support displaying a badge on label-only bottom navigation views.
     return null;