[Badge][Toolbar] Fix issue where menu item content description is not reset after clearing badge content

PiperOrigin-RevId: 675531679

Author: dsn5ft

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

@@ -149,7 +149,7 @@ private static void attachBadgeContentDescription(
             public void onInitializeAccessibilityNodeInfo(
                 View host, AccessibilityNodeInfoCompat info) {
               super.onInitializeAccessibilityNodeInfo(host, info);
-              info.setContentDescription(badgeDrawable.getContentDescription());
+              info.setContentDescription(getBadgeAnchorContentDescription(view, badgeDrawable));
             }
           });
     } else {
@@ -160,12 +160,20 @@ public void onInitializeAccessibilityNodeInfo(
             public void onInitializeAccessibilityNodeInfo(
                 View host, AccessibilityNodeInfoCompat info) {
               super.onInitializeAccessibilityNodeInfo(host, info);
-              info.setContentDescription(badgeDrawable.getContentDescription());
+              info.setContentDescription(getBadgeAnchorContentDescription(view, badgeDrawable));
             }
           });
     }
   }
 
+  private static CharSequence getBadgeAnchorContentDescription(
+      View anchor, BadgeDrawable badgeDrawable) {
+    CharSequence badgeContentDescription = badgeDrawable.getContentDescription();
+    return badgeContentDescription != null
+        ? badgeContentDescription
+        : anchor.getContentDescription();
+  }
+
   /**
    * Detaches a BadgeDrawable from its associated anchor. The BadgeDrawable will be removed from its
    * anchor's ViewOverlay. If it has a FrameLayout custom parent that is an ancestor of the anchor,
@@ -213,7 +221,7 @@ private static void detachBadgeContentDescription(@NonNull View view) {
             public void onInitializeAccessibilityNodeInfo(
                 View host, AccessibilityNodeInfoCompat info) {
               super.onInitializeAccessibilityNodeInfo(host, info);
-              info.setContentDescription(null);
+              info.setContentDescription(view.getContentDescription());
             }
           });
     } else {