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

Commit 8a2eb5e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix keyboard navigation work in Settings home page" into rvc-dev

parents 03b20f86 8870dcb4

res/layout/settings_homepage_container.xml

+4 −3
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
            android:id="@+id/homepage_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:descendantFocusability="blocksDescendants">

            android:orientation="vertical">



            <FrameLayout

                android:id="@+id/contextual_cards_content"
@@ -55,7 +54,9 @@ 


    <com.google.android.material.appbar.AppBarLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:touchscreenBlocksFocus="false"

        android:keyboardNavigationCluster="false">

        <include layout="@layout/search_bar"/>

    </com.google.android.material.appbar.AppBarLayout>

</androidx.coordinatorlayout.widget.CoordinatorLayout>

src/com/android/settings/homepage/SettingsHomepageActivity.java

+5 −1
Original line number Diff line number Diff line
@@ -90,5 +90,9 @@ public class SettingsHomepageActivity extends FragmentActivity { 
        // The top padding is the height of action bar(48dp) + top/bottom margins(16dp)

        final int paddingTop = searchBarHeight + searchBarMargin * 2;

        view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */);



        // Prevent inner RecyclerView gets focus and invokes scrolling.

        view.setFocusableInTouchMode(true);

        view.requestFocus();

    }

}