commit 637eeefb53ba75f099f1127e294a4d784763401a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 02 06:17:55 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 02 06:17:55 2021 +0000
tree e94da943a4ec6509cc4eae8dad013a99db0e865b
parent 082de8bfd9cad1b001d9aa2e18354b7abddfae13
parent 747597c72af515eff92a5db695d82cfbd117043d

Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev

res/layout/reset_network.xml

diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index f6135a9..47fa56a 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_marginStart="@dimen/reset_network_margin_start"
@@ -38,7 +38,7 @@
                 android:text="@string/reset_network_desc" />
             <include layout="@layout/reset_esim_checkbox"/>
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
     <Spinner android:id="@+id/reset_network_subscription"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"