From 55969e59c1ff657703f7163699c2466f817e7522 Mon Sep 17 00:00:00 2001
From: David Liu <dswliu@google.com>
Date: Tue, 20 Feb 2024 23:18:20 +0000
Subject: [PATCH] [Two-pane] Fix keyboard navigation issue, searchbar not able
 to be selected.

- make search toolbar focusable
- set next tab navigation element to homepage_container

Bug: 324420544
Test: manual
Change-Id: I2783b7540d954f7adf64c6ac3e90d91c196646c5
---
 res/layout/search_bar_two_pane_version.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/layout/search_bar_two_pane_version.xml b/res/layout/search_bar_two_pane_version.xml
index f98985ce46d..337294e0280 100644
--- a/res/layout/search_bar_two_pane_version.xml
+++ b/res/layout/search_bar_two_pane_version.xml
@@ -29,6 +29,9 @@
         android:paddingStart="@dimen/search_bar_padding_start_two_pane"
         android:paddingEnd="@dimen/search_bar_padding_end_two_pane"
         android:background="@drawable/search_bar_selected_background"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:nextFocusForward="@+id/homepage_container"
         android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
         android:navigationIcon="@drawable/ic_homepage_search">
         <TextView
@@ -40,4 +43,4 @@
             android:layout_gravity="start"
             android:text="@string/search_settings"/>
     </Toolbar>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>