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

Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 39baaf4353

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: Ib8fabdd09235d300299853300bf7068f68dcc14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zoey Chen
2023-04-07 19:06:16 +00:00
committed by Automerger Merge Worker
parent 580df886d3 39baaf4353
commit d15fe76759
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/locale_order_list.xml
View File

@@ -14,11 +14,11 @@
limitations under the License.
-->
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutDirection="locale"
android:textDirection="locale">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutDirection="locale"
android:textDirection="locale">
<LinearLayout
android:layout_width="match_parent"
@@ -48,4 +48,4 @@
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</FrameLayout>

1
src/com/android/settings/localepicker/LocaleListEditor.java
View File

@@ -329,6 +329,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
list.setLayoutManager(llm);
list.setHasFixedSize(true);
list.setNestedScrollingEnabled(false);
mAdapter.setRecyclerView(list);
list.setAdapter(mAdapter);