[ChipGroup][a11y] Follow up

PiperOrigin-RevId: 758334270
(cherry picked from commit 1fe726f)

Author: paulfthomas

catalog/java/io/material/catalog/chip/ChipGroupDemoFragment.java

@@ -74,6 +74,7 @@ public View onCreateDemoView(
     fab.setOnClickListener(
         v -> {
           // Reload the chip group UI.
+          reflowGroup.setSingleLine(true);
           initChipGroup(reflowGroup, false);
           initChipGroup(scrollGroup, true);
         });
@@ -92,42 +93,54 @@ protected int getChipGroupItem(boolean singleSelection) {
         : R.layout.cat_chip_group_item_filter;
   }
 
-  private void initChipGroup(ChipGroup chipGroup, boolean shouldShowAll) {
+  private void initChipGroup(ChipGroup chipGroup, boolean showMenu) {
     chipGroup.removeAllViews();
 
+    Chip viewAllChip = new Chip(chipGroup.getContext());
+    viewAllChip.setText(viewAllChip.getResources().getString(R.string.cat_chip_text_all));
+    viewAllChip.setChipIconResource(R.drawable.ic_drawer_menu_open_24px);
+    viewAllChip.setChipIconTint(viewAllChip.getTextColors());
+    viewAllChip.setChipIconVisible(true);
+    chipGroup.addView(viewAllChip);
+
     PopupMenu menu;
-    if (shouldShowAll) {
-      Chip viewAllChip = new Chip(chipGroup.getContext());
-      viewAllChip.setText(viewAllChip.getResources().getString(R.string.cat_chip_text_all));
-      viewAllChip.setChipIconResource(R.drawable.ic_drawer_menu_open_24px);
-      viewAllChip.setChipIconTint(viewAllChip.getTextColors());
-      viewAllChip.setChipIconVisible(true);
+    if (showMenu) {
       menu = new PopupMenu(viewAllChip.getContext(), viewAllChip);
       viewAllChip.setOnClickListener(v -> menu.show());
-      chipGroup.addView(viewAllChip);
     } else {
       menu = null;
+      viewAllChip.setOnClickListener(
+          v -> {
+            if (chipGroup.isSingleLine()) {
+              chipGroup.setSingleLine(false);
+              initChipGroup(chipGroup, false);
+            }
+          });
     }
 
     boolean singleSelection = singleSelectionSwitch.isChecked();
     String[] textArray = getResources().getStringArray(R.array.cat_chip_group_text_array);
     for (int i = 0; i < textArray.length; i++) {
+      Chip chip =
+          (Chip) getLayoutInflater().inflate(getChipGroupItem(singleSelection), chipGroup, false);
+      chip.setId(i);
+      chip.setText(textArray[i]);
+      chip.setCloseIconVisible(false);
+      chipGroup.addView(chip);
+
       if (menu != null) {
         menu.getMenu().add(Menu.NONE, i, i, textArray[i]);
+        menu.getMenu().setGroupCheckable(Menu.NONE, true, singleSelection);
         menu.setOnMenuItemClickListener(
             menuItem -> {
-              chipGroup.check(menuItem.getItemId());
+              Chip targetChip = (Chip) chipGroup.getChildAt(menuItem.getOrder() + 1);
+              targetChip.setChecked(!targetChip.isChecked());
+              menuItem.setChecked(targetChip.isChecked());
               return true;
             });
+        chip.setOnCheckedChangeListener(
+            (buttonView, isChecked) -> menu.getMenu().getItem(chip.getId()).setChecked(isChecked));
       }
-
-      Chip chip =
-          (Chip) getLayoutInflater().inflate(getChipGroupItem(singleSelection), chipGroup, false);
-      chip.setId(i);
-      chip.setText(textArray[i]);
-      chip.setCloseIconVisible(true);
-      chip.setOnCloseIconClickListener(v -> chipGroup.removeView(chip));
-      chipGroup.addView(chip);
     }
   }
 }

catalog/java/io/material/catalog/chip/ChipRecyclerviewDemoFragment.java

@@ -111,11 +111,15 @@ public void onBindViewHolder(MyViewHolder holder, int position) {
           for (int i = 1; i < getItemCount(); i++) {
             menu.getMenu().add(Menu.NONE, i, i, text + " " + i);
           }
+          menu.getMenu().setGroupCheckable(Menu.NONE, true, false);
           menu.setOnMenuItemClickListener(
               menuItem -> {
                 int id = menuItem.getItemId();
                 if (!checkedChipId.remove(id)) {
                   checkedChipId.add(id);
+                  menuItem.setChecked(true);
+                } else {
+                  menuItem.setChecked(false);
                 }
                 notifyItemChanged(id);
                 return true;
@@ -125,6 +129,9 @@ public void onBindViewHolder(MyViewHolder holder, int position) {
       } else {
         chip.setChecked(checkedChipId.contains(position));
         chip.setText(text + " " + position);
+        chip.setOnCheckedChangeListener(
+            (buttonView, isChecked) ->
+                menu.getMenu().getItem((Integer) chip.getTag() - 1).setChecked(isChecked));
       }
     }
 

catalog/java/io/material/catalog/chip/res/layout/cat_chip_group_fragment.xml

@@ -43,14 +43,12 @@
         app:srcCompat="@drawable/ic_refresh_black_24px"
         app:fabSize="mini"/>
 
-  <FrameLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content">
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical">
+        android:layout_gravity="center_vertical"
+        android:layout_marginTop="32dp">
+
       <LinearLayout
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
@@ -68,7 +66,8 @@
             android:id="@+id/reflow_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"/>
+            android:layout_margin="16dp"
+            app:singleLine="true"/>
 
         <!-- Scrolling chip group. -->
         <TextView
@@ -81,11 +80,10 @@
             android:layout_margin="16dp">
           <com.google.android.material.chip.ChipGroup
               android:id="@+id/scroll_group"
-              android:layout_width="match_parent"
+              android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               app:singleLine="true"/>
         </HorizontalScrollView>
       </LinearLayout>
     </ScrollView>
-  </FrameLayout>
 </LinearLayout>

catalog/java/io/material/catalog/chip/res/layout/cat_chip_group_item_filter.xml

@@ -17,7 +17,6 @@
 
 <com.google.android.material.chip.Chip
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/Widget.Material3.Chip.Filter"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"/>