Fix bug in bottom navigation badge state restoration that did not set the badges on the menu item views.

Update catalog demo to save and restore states in the bottom navigation demos.

PiperOrigin-RevId: 278436621
(cherry picked from commit de00502)

Author: wcshi

catalog/java/io/material/catalog/bottomnav/BottomNavigationDemoFragment.java

@@ -87,8 +87,9 @@ public View onCreateDemoView(
           return false;
         };
     setBottomNavListeners(navigationItemListener);
-
-    setupBadging();
+    if (bundle == null) {
+      setupBadging();
+    }
     return view;
   }
 

catalog/java/io/material/catalog/bottomnav/res/layout/cat_bottom_nav.xml

@@ -19,6 +19,7 @@
 <com.google.android.material.bottomnavigation.BottomNavigationView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cat_bottom_nav"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"

catalog/java/io/material/catalog/bottomnav/res/layout/cat_bottom_navs.xml

@@ -17,6 +17,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
@@ -27,9 +28,8 @@
       android:layout_margin="@dimen/cat_bottom_nav_standard_spacing"
       android:text="@string/cat_bottom_nav_legacy_title"/>
   <com.google.android.material.bottomnavigation.BottomNavigationView
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
       style="@style/Widget.Design.BottomNavigationView"
+      android:id="@+id/cat_bottom_nav1"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:menu="@menu/bottom_nav_menu"/>
@@ -42,8 +42,7 @@
       android:layout_margin="@dimen/cat_bottom_nav_standard_spacing"
       android:text="@string/cat_bottom_nav_title"/>
   <com.google.android.material.bottomnavigation.BottomNavigationView
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
+      android:id="@+id/cat_bottom_nav2"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:menu="@menu/bottom_nav_menu"/>

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

@@ -29,6 +29,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.util.Pools;
 import androidx.core.view.ViewCompat;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -619,6 +620,11 @@ SparseArray<BadgeDrawable> getBadgeDrawables() {
 
   void setBadgeDrawables(SparseArray<BadgeDrawable> badgeDrawables) {
     this.badgeDrawables = badgeDrawables;
+    if (buttons != null) {
+      for (BottomNavigationItemView itemView : buttons) {
+        itemView.setBadge(badgeDrawables.get(itemView.getId()));
+      }
+    }
   }
 
   @Nullable
@@ -689,7 +695,8 @@ private void removeUnusedBadges() {
   }
 
   @Nullable
-  private BottomNavigationItemView findItemView(int menuItemId) {
+  @VisibleForTesting
+  BottomNavigationItemView findItemView(int menuItemId) {
     validateMenuItemId(menuItemId);
     if (buttons != null) {
       for (BottomNavigationItemView itemView : buttons) {

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

@@ -42,6 +42,7 @@
 import androidx.annotation.StyleRes;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.MaterialShapeUtils;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.customview.view.AbsSavedState;
@@ -116,7 +117,7 @@ public class BottomNavigationView extends FrameLayout {
   private static final int MENU_PRESENTER_ID = 1;
 
   @NonNull private final MenuBuilder menu;
-  @NonNull private final BottomNavigationMenuView menuView;
+  @NonNull @VisibleForTesting final BottomNavigationMenuView menuView;
   private final BottomNavigationPresenter presenter = new BottomNavigationPresenter();
   @Nullable private ColorStateList itemRippleColor;
   private MenuInflater menuInflater;

tests/javatests/com/google/android/material/bottomnavigation/BottomNavigationViewTest.java

@@ -49,6 +49,7 @@
 import android.os.Parcelable;
 import androidx.annotation.ColorInt;
 import androidx.core.content.res.ResourcesCompat;
+import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -635,16 +636,22 @@ public void testSavedState() throws Throwable {
     onView(withId(R.id.bottom_navigation))
         .perform(showBadgeNumberForMenuItem(R.id.destination_home, 75));
     assertTrue(bottomNavigation.getMenu().findItem(R.id.destination_profile).isChecked());
-    // Save the state
-    final Parcelable state = bottomNavigation.onSaveInstanceState();
+
+    // Save the current state
+    SparseArray<Parcelable> container = new SparseArray<>();
+    bottomNavigation.saveHierarchyState(container);
 
     // Restore the state into a fresh BottomNavigationView
     activityTestRule.runOnUiThread(
         () -> {
           BottomNavigationView testView = new BottomNavigationView(activityTestRule.getActivity());
+          testView.setId(R.id.bottom_navigation);
           testView.inflateMenu(R.menu.bottom_navigation_view_content);
-          testView.onRestoreInstanceState(state);
+          testView.restoreHierarchyState(container);
           assertTrue(testView.getMenu().findItem(R.id.destination_profile).isChecked());
+
+          assertTrue(testView.menuView.findItemView(R.id.destination_home).getBadge().isVisible());
+
           assertTrue(testView.getBadge(R.id.destination_home).isVisible());
           assertEquals(75, testView.getBadge(R.id.destination_home).getNumber());
           assertEquals(4, testView.getBadge(R.id.destination_home).getMaxCharacterCount());