From fc7d3e8ef84e028002639d4b6f7cfdfaf7117d56 Mon Sep 17 00:00:00 2001 From: Massimo Carli Date: Fri, 1 Sep 2023 15:47:13 +0000 Subject: Fix accessibility navigation on search bar selection Navigation is fixed when a11y is enabled and the search button is selected. Fix: 297471152 Test: Manual following bug description Change-Id: I2d49ad0646c160c6b3538d7beb0b7004130a0d68 --- .../src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt index 67f4418b7e4c..0a33b9bc6bc7 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/widget/scaffold/SearchScaffold.kt @@ -18,6 +18,7 @@ package com.android.settingslib.spa.widget.scaffold import androidx.activity.compose.BackHandler import androidx.appcompat.R +import androidx.compose.foundation.focusable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.RowScope @@ -96,7 +97,8 @@ fun SearchScaffold( Modifier .padding(paddingValues.horizontalValues()) .padding(top = paddingValues.calculateTopPadding()) - .fillMaxSize(), + .focusable() + .fillMaxSize() ) { content( bottomPadding = paddingValues.calculateBottomPadding(), -- cgit v1.2.3-59-g8ed1b