From 968e035e835364faf38a481160d25838151a0942 Mon Sep 17 00:00:00 2001
From: pfthomas <pfthomas@google.com>
Date: Mon, 29 Aug 2022 08:39:33 -0700
Subject: [PATCH] [BottomAppBar][Catalog][a11y] Request focus on search menu
 when showing

PiperOrigin-RevId: 470727992
---
 .../catalog/bottomappbar/BottomAppBarMainDemoFragment.java     | 3 +++
 .../io/material/catalog/bottomappbar/res/menu/demo_primary.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java b/catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java
index ec5487b7ba3..9fbd5ea1491 100644
--- a/catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/bottomappbar/BottomAppBarMainDemoFragment.java
@@ -18,6 +18,7 @@
 
 import io.material.catalog.R;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -184,6 +185,7 @@ private void setUpBottomAppBarShapeAppearance() {
         babBackground.getShapeAppearanceModel().toBuilder().setTopEdge(topEdge).build());
   }
 
+  @SuppressLint("NewApi")
   protected void setUpBottomDrawer(View view) {
     View bottomDrawer = coordinatorLayout.findViewById(R.id.bottom_drawer);
     bottomDrawerBehavior = BottomSheetBehavior.from(bottomDrawer);
@@ -193,6 +195,7 @@ protected void setUpBottomDrawer(View view) {
         v -> bottomDrawerBehavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED));
     bar.setNavigationIcon(R.drawable.ic_drawer_menu_24px);
     bar.replaceMenu(R.menu.demo_primary);
+    bar.getMenu().findItem(R.id.menu_search).getActionView().requestFocus();
   }
 
   private void showSnackbar(CharSequence text) {
diff --git a/catalog/java/io/material/catalog/bottomappbar/res/menu/demo_primary.xml b/catalog/java/io/material/catalog/bottomappbar/res/menu/demo_primary.xml
index 83e12e22b5e..eb7edf5ec3a 100644
--- a/catalog/java/io/material/catalog/bottomappbar/res/menu/demo_primary.xml
+++ b/catalog/java/io/material/catalog/bottomappbar/res/menu/demo_primary.xml
@@ -18,6 +18,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
   <item
+      android:id="@+id/menu_search"
       android:icon="@drawable/ic_search_24px"
       android:title="@string/cat_bottomappbar_search"
       app:showAsAction="ifRoom"/>