ScoopDroid/android_packages_apps_Settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix toolbar keyboard navigation and touch." into 24D1-dev

Browse source
This commit is contained in:
Lynn Yeh 2024-03-20 07:56:36 +00:00 • committed by Android (Google) Code Review
commit 4115a9a278
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/layout/search_bar.xml
View file

@ -34,8 +34,7 @@
android:paddingStart="@dimen/search_bar_padding_start"
android:paddingEnd="@dimen/search_bar_padding_end"
android:background="@drawable/search_bar_selected_background"
android:focusable="true"
android:focusableInTouchMode="true"
android:touchscreenBlocksFocus="false"
android:nextFocusForward="@+id/homepage_container"
android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
android:navigationIcon="@drawable/ic_homepage_search">

3
res/layout/search_bar_two_pane_version.xml
View file

@ -29,8 +29,7 @@
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:touchscreenBlocksFocus="false"
android:nextFocusForward="@+id/homepage_container"
android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
android:navigationIcon="@drawable/ic_homepage_search">

1
src/com/android/settings/search/SearchFeatureProvider.java
View file

@ -100,6 +100,7 @@ public interface SearchFeatureProvider {
// and goes to the search UI. Also set the background to null so there's no ripple.
final View navView = toolbar.getNavigationView();
navView.setClickable(false);
navView.setFocusable(false);
navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
navView.setBackground(null);