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

Commit 9b63fbb7 authored by David Liu's avatar David Liu
Browse files

Fix toolbar keyboard navigation and touch. 

- toolbar default has touchscreenBlocksFocus enabled which make toolbar not focusable when touch screen present. Explicitly set touchscreenBlocksFocus to false make the toolbar can be focus when keyboard navigation.
- Remove focusableInTouchMode which breaks normal touch control. Read https://android-developers.googleblog.com/2008/12/touch-mode.html for more details.

Fix: 327025582
Fix: 324420544
Test: manual test with keyboard and touch navigation

Change-Id: I6cad869e3a51926405a6f3ae894daa5416050bf8
parent 0023b2c1

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);