PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26424687'] into 24Q2-release.

Browse Source 
Change-Id: Ia6a9ea09ee3fa07ac349fb15f907ed9b401ac313
This commit is contained in:
Android Build Coastguard Worker
2024-03-15 00:04:11 +00:00
parent bc99244e96 d469ee1ebf
commit bc5ec2b4e2
3 changed files with 3 additions and 4 deletions
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:paddingStart="@dimen/search_bar_padding_start"
android:paddingEnd="@dimen/search_bar_padding_end" android:paddingEnd="@dimen/search_bar_padding_end"
android:background="@drawable/search_bar_selected_background" android:background="@drawable/search_bar_selected_background"
android:focusable="true" android:touchscreenBlocksFocus="false"
android:focusableInTouchMode="true"
android:nextFocusForward="@+id/homepage_container" android:nextFocusForward="@+id/homepage_container"
android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset" android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
android:navigationIcon="@drawable/ic_homepage_search"> 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:paddingStart="@dimen/search_bar_padding_start_two_pane"
android:paddingEnd="@dimen/search_bar_padding_end_two_pane" android:paddingEnd="@dimen/search_bar_padding_end_two_pane"
android:background="@drawable/search_bar_selected_background" android:background="@drawable/search_bar_selected_background"
android:focusable="true" android:touchscreenBlocksFocus="false"
android:focusableInTouchMode="true"
android:nextFocusForward="@+id/homepage_container" android:nextFocusForward="@+id/homepage_container"
android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset" android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
android:navigationIcon="@drawable/ic_homepage_search"> 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. // and goes to the search UI. Also set the background to null so there's no ripple.
final View navView = toolbar.getNavigationView(); final View navView = toolbar.getNavigationView();
navView.setClickable(false); navView.setClickable(false);
navView.setFocusable(false);
navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO); navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
navView.setBackground(null); navView.setBackground(null);