Merge "Make Reset Wi-Fi, mobile & bluetooth scrollable" into sc-dev am: 637eeefb53

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb8c6b614d465ab2b18086cd10172eea2c46a3cb
This commit is contained in:
TreeHugger Robot
2021-03-02 07:20:40 +00:00
committed by Automerger Merge Worker

View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ScrollView <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_marginStart="@dimen/reset_network_margin_start" android:layout_marginStart="@dimen/reset_network_margin_start"
@@ -38,7 +38,7 @@
android:text="@string/reset_network_desc" /> android:text="@string/reset_network_desc" />
<include layout="@layout/reset_esim_checkbox"/> <include layout="@layout/reset_esim_checkbox"/>
</LinearLayout> </LinearLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>
<Spinner android:id="@+id/reset_network_subscription" <Spinner android:id="@+id/reset_network_subscription"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"