Merge "Add scrollView with config layout and button layout" into sc-dev am: 1637f3cd26

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

Change-Id: If2c4ed2f1516aaed5317c0042fdb24f169aafde2
This commit is contained in:
Betty Chang
2021-05-05 11:09:46 +00:00
committed by Automerger Merge Worker

View File

@@ -22,19 +22,29 @@
android:layout_height="wrap_content"
android:clipToPadding="true"
android:clipChildren="true">
<include
android:id="@+id/wifi_dialog_frame"
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/add_network_button_bar"
app:layout_constraintTop_toTopOf="parent"
layout="@layout/wifi_dialog"/>
android:scrollIndicators="top|bottom">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include
android:id="@+id/wifi_dialog_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/add_network_button_bar"
app:layout_constraintTop_toTopOf="parent"
layout="@layout/wifi_dialog"/>
<include
android:id="@+id/add_network_button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/wifi_dialog_frame"
layout="@*android:layout/alert_dialog_button_bar_material"/>
</LinearLayout>
</ScrollView>
<include
android:id="@+id/add_network_button_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/wifi_dialog_frame"
layout="@*android:layout/alert_dialog_button_bar_material"/>
</androidx.constraintlayout.widget.ConstraintLayout>