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

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

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

View File

@@ -21,7 +21,7 @@
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_weight="1.0" android:layout_weight="1.0"
@@ -173,5 +173,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>