From 747597c72af515eff92a5db695d82cfbd117043d Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Sat, 27 Feb 2021 04:06:20 +0800
Subject: [PATCH] Make Reset Wi-Fi, mobile & bluetooth scrollable

After setting both font size and display size to largest and enabling
collapsing toolbar, the content in this page will be out of screen
and be unable to scroll. Updating ScrollView to NestedScrollView can fix
this kind of issue since ScrollView can't work with CoordinatorLayout.

Bug: 178458729
Test: visual verified
1) Set font size and display size to largest
2) Navigate to Settings -> System -> Reset options -> Reset Wi-Fi mobile
& bluetooth
3) Observe and check if the content area is able to scroll.

Change-Id: I63451b99c6caa9283a45499e1374a58ccc224bfb
---
 res/layout/reset_network.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index f6135a9af21..47fa56ad44f 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"