Merge "Fix overlapping problem for device admin page" into sc-dev am: 417af889e1

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

Change-Id: Ia5e72969e61f8af560a2617579386bd031891bbe
This commit is contained in:
TreeHugger Robot
2021-05-21 10:00:14 +00:00
committed by Automerger Merge Worker

View File

@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
@@ -173,5 +173,5 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>
</LinearLayout>