Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 710b4cdc authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix toolbar keyboard navigation and touch." into main

parents 175a901f 9b63fbb7

res/layout/search_bar.xml

+1 −2
Original line number Diff line number Diff line
@@ -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">

res/layout/search_bar_two_pane_version.xml

+1 −2
Original line number Diff line number Diff line
@@ -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">

src/com/android/settings/search/SearchFeatureProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -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);