[List][Catalog] Address a11y issues

imhappi · drchen · commit 6310274b7223 · 2025-11-24T12:42:08.000-08:00
PiperOrigin-RevId: 834524481
diff --git a/catalog/java/io/material/catalog/listitem/CustomListItemData.java b/catalog/java/io/material/catalog/listitem/CustomListItemData.java
@@ -15,8 +15,11 @@
  */
 package io.material.catalog.listitem;
 
-/** A sample data class used to represent List Items **/
-class CustomListItemData {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/** A sample data class used to represent List Items * */
+class CustomListItemData implements Parcelable {
   String text;
   boolean checked;
   int indexInSection;
@@ -32,4 +35,39 @@ public CustomListItemData(String text, int indexInSection, int sectionCount) {
   public CustomListItemData(String subheading) {
     this.subheading = subheading;
   }
+
+  protected CustomListItemData(Parcel in) {
+    text = in.readString();
+    checked = in.readByte() != 0;
+    indexInSection = in.readInt();
+    sectionCount = in.readInt();
+    subheading = in.readString();
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(text);
+    dest.writeByte((byte) (checked ? 1 : 0));
+    dest.writeInt(indexInSection);
+    dest.writeInt(sectionCount);
+    dest.writeString(subheading);
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Creator<CustomListItemData> CREATOR =
+      new Creator<CustomListItemData>() {
+        @Override
+        public CustomListItemData createFromParcel(Parcel in) {
+          return new CustomListItemData(in);
+        }
+
+        @Override
+        public CustomListItemData[] newArray(int size) {
+          return new CustomListItemData[size];
+        }
+      };
 }
diff --git a/catalog/java/io/material/catalog/listitem/ListsMainDemoFragment.java b/catalog/java/io/material/catalog/listitem/ListsMainDemoFragment.java
@@ -46,6 +46,10 @@
 
 /** A fragment that displays the main List demos for the Catalog app. */
 public class ListsMainDemoFragment extends DemoFragment {
+
+  private static final String KEY_LIST_DATA = "key_list_data";
+  private ArrayList<CustomListItemData> listData;
+
   @NonNull
   @Override
   public View onCreateDemoView(
@@ -56,16 +60,20 @@ public View onCreateDemoView(
         (RecyclerView) layoutInflater.inflate(R.layout.cat_lists_fragment, viewGroup, false);
 
     view.setLayoutManager(new LinearLayoutManager(getContext()));
-    List<CustomListItemData> data = new ArrayList<>();
-    for (int i = 0; i < 20; i++) {
-      data.add(
-          new CustomListItemData(
-              String.format(view.getContext().getString(R.string.cat_list_item_text), i + 1),
-              i,
-              20));
+    if (bundle != null) {
+      listData = bundle.getParcelableArrayList(KEY_LIST_DATA);
+    } else {
+      listData = new ArrayList<>();
+      for (int i = 0; i < 20; i++) {
+        listData.add(
+            new CustomListItemData(
+                String.format(view.getContext().getString(R.string.cat_list_item_text), i + 1),
+                i,
+                20));
+      }
     }
 
-    view.setAdapter(new ListsAdapter(data));
+    view.setAdapter(new ListsAdapter(listData));
     view.addItemDecoration(new MarginItemDecoration(getContext()));
 
     return view;
@@ -172,4 +180,10 @@ public void bind(@NonNull CustomListItemData data) {
           });
     }
   }
+
+  @Override
+  public void onSaveInstanceState(@NonNull Bundle outState) {
+    super.onSaveInstanceState(outState);
+    outState.putParcelableArrayList(KEY_LIST_DATA, listData);
+  }
 }
diff --git a/catalog/java/io/material/catalog/listitem/MultiSectionListDemoFragment.java b/catalog/java/io/material/catalog/listitem/MultiSectionListDemoFragment.java
@@ -29,8 +29,10 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.android.material.listitem.ListItemCardView;
 import com.google.android.material.listitem.ListItemViewHolder;
 import io.material.catalog.feature.DemoFragment;
 import java.util.ArrayList;
@@ -172,15 +174,20 @@ public void getItemOffsets(@NonNull Rect outRect,
   public static class CustomItemViewHolder extends ListItemViewHolder {
 
     private final TextView textView;
+    private final ListItemCardView cardView;
 
     public CustomItemViewHolder(@NonNull View itemView) {
       super(itemView);
       textView = itemView.findViewById(R.id.cat_list_item_text);
+      cardView = itemView.findViewById(R.id.cat_list_item_card_view);
     }
 
     public void bind(@NonNull CustomListItemData data) {
       super.bind(data.indexInSection, data.sectionCount);
       textView.setText(data.text);
+      cardView.setOnClickListener(
+          v -> Toast.makeText(v.getContext(), R.string.mtrl_list_item_clicked, Toast.LENGTH_SHORT)
+              .show());
     }
   }
 
diff --git a/catalog/java/io/material/catalog/listitem/SegmentedListDemoFragment.java b/catalog/java/io/material/catalog/listitem/SegmentedListDemoFragment.java
@@ -41,7 +41,12 @@
 /** A fragment that displays a segmented List demos for the Catalog app. */
 public class SegmentedListDemoFragment extends ListsMainDemoFragment {
 
+  private static final String KEY_LIST_DATA = "key_list_data";
+  private static final String KEY_SELECTED_POSITION = "key_selected_position";
+
+  private ArrayList<CustomListItemData> listData;
   private ListsAdapter adapter;
+
   @NonNull
   @Override
   public View onCreateDemoView(
@@ -53,16 +58,23 @@ public View onCreateDemoView(
             layoutInflater.inflate(R.layout.cat_lists_bright_background_fragment, viewGroup, false);
 
     view.setLayoutManager(new LinearLayoutManager(getContext()));
-    List<CustomListItemData> data = new ArrayList<>();
-    for (int i = 0; i < 20; i++) {
-      data.add(
-          new CustomListItemData(
-              String.format(view.getContext().getString(R.string.cat_list_item_text), i + 1),
-              i,
-              20));
+    if (bundle != null) {
+      listData = bundle.getParcelableArrayList(KEY_LIST_DATA);
+    } else {
+      listData = new ArrayList<>();
+      for (int i = 0; i < 20; i++) {
+        listData.add(
+            new CustomListItemData(
+                String.format(view.getContext().getString(R.string.cat_list_item_text), i + 1),
+                i,
+                20));
+      }
     }
 
-    adapter = new ListsAdapter(data);
+    adapter = new ListsAdapter(listData);
+    if (bundle != null) {
+      adapter.setSelectedPosition(bundle.getInt(KEY_SELECTED_POSITION, NO_SELECTION));
+    }
     view.setAdapter(adapter);
     view.addItemDecoration(new MarginItemDecoration(getContext()));
 
@@ -149,4 +161,11 @@ public void bind(@NonNull CustomListItemData data) {
           });
     }
   }
+
+  @Override
+  public void onSaveInstanceState(@NonNull Bundle outState) {
+    super.onSaveInstanceState(outState);
+    outState.putParcelableArrayList(KEY_LIST_DATA, listData);
+    outState.putInt(KEY_SELECTED_POSITION, adapter.getSelectedPosition());
+  }
 }
diff --git a/catalog/java/io/material/catalog/listitem/res/layout/cat_list_multisection_viewholder.xml b/catalog/java/io/material/catalog/listitem/res/layout/cat_list_multisection_viewholder.xml
@@ -25,7 +25,6 @@
   <com.google.android.material.listitem.ListItemCardView
     style="?attr/listItemCardViewSegmentedStyle"
     android:id="@+id/cat_list_item_card_view"
-    android:checkable="true"
     android:clickable="true"
     android:focusable="true"
     android:layout_height="wrap_content"
diff --git a/lib/java/com/google/android/material/listitem/res/values/styles.xml b/lib/java/com/google/android/material/listitem/res/values/styles.xml
@@ -80,10 +80,16 @@
   <!-- Styles for List item content. -->
   <style name="Widget.Material3.ImageView.ListItem.LeadingIcon" parent="android:Widget">
     <item name="tint">@color/m3_list_item_leading_icon_color_selector</item>
+    <item name="android:importantForAccessibility">no</item>
+    <item name="android:focusable">false</item>
+    <item name="android:clickable">false</item>
   </style>
 
   <style name="Widget.Material3.ImageView.ListItem.TrailingIcon" parent="android:Widget">
     <item name="tint">@color/m3_list_item_trailing_icon_color_selector</item>
+    <item name="android:importantForAccessibility">no</item>
+    <item name="android:focusable">false</item>
+    <item name="android:clickable">false</item>
   </style>
 
   <style name="Widget.Material3.ShapeableImageView.ListItem.LeadingImage" parent="Widget.MaterialComponents.ShapeableImageView">
@@ -114,23 +120,20 @@
   <style name="Widget.Material3.Checkbox.ListItem" parent="Widget.Material3.CompoundButton.CheckBox">
     <item name="android:focusable">false</item>
     <item name="android:clickable">false</item>
-    <item name="android:importantForAccessibility">no</item>
     <item name="android:background">@null</item>
     <item name="buttonTint">@color/m3_list_item_checkbox_button_tint_selector</item>
   </style>
 
   <style name="Widget.Material3.Switch.ListItem" parent="Widget.Material3.CompoundButton.MaterialSwitch">
     <item name="android:focusable">false</item>
     <item name="android:clickable">false</item>
-    <item name="android:importantForAccessibility">no</item>
     <item name="android:background">@null</item>
     <item name="trackTint">@color/m3_list_item_switch_track_tint_selector</item>
   </style>
 
   <style name="Widget.Material3.RadioButton.ListItem" parent="Widget.Material3.CompoundButton.RadioButton">
     <item name="android:focusable">false</item>
     <item name="android:clickable">false</item>
-    <item name="android:importantForAccessibility">no</item>
     <item name="android:background">@null</item>
     <item name="buttonTint">@color/m3_list_item_radio_button_tint_selector</item>
   </style>
