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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-08 05:28:24 +00:00
committed by Android (Google) Code Review
parent 03b20f864a 8870dcb421
commit 8a2eb5e8bc
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/settings_homepage_container.xml
View File

@@ -33,8 +33,7 @@
android:id="@+id/homepage_container" android:id="@+id/homepage_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical">
android:descendantFocusability="blocksDescendants">
<FrameLayout <FrameLayout
android:id="@+id/contextual_cards_content" android:id="@+id/contextual_cards_content"
@@ -55,7 +54,9 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" 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"/> <include layout="@layout/search_bar"/>
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

6
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -90,5 +90,9 @@ public class SettingsHomepageActivity extends FragmentActivity {
// The top padding is the height of action bar(48dp) + top/bottom margins(16dp) // The top padding is the height of action bar(48dp) + top/bottom margins(16dp)
final int paddingTop = searchBarHeight + searchBarMargin * 2; final int paddingTop = searchBarHeight + searchBarMargin * 2;
view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */); view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */);
// Prevent inner RecyclerView gets focus and invokes scrolling.
view.setFocusableInTouchMode(true);
view.requestFocus();
} }
} }