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

Commit 8cd0c581 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev

parents 7a49bfe6 48008016

res/layout/locale_order_list.xml

+6 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

             android:layout_width="match_parent"

             android:layout_height="match_parent"

             android:layoutDirection="locale"
@@ -48,4 +48,4 @@ 


    </LinearLayout>



</androidx.core.widget.NestedScrollView>
 
</FrameLayout>

src/com/android/settings/localepicker/LocaleListEditor.java

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment { 
        list.setLayoutManager(llm);



        list.setHasFixedSize(true);

        list.setNestedScrollingEnabled(false);

        mAdapter.setRecyclerView(list);

        list.setAdapter(mAdapter);