Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1107c1c2 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix Voice Access scroll down in the Add network" into tm-dev

parents 9b28ecf9 7e47784d
Loading
Loading
Loading
Loading
+8 −28
Original line number Diff line number Diff line
@@ -15,36 +15,16 @@
     limitations under the License.
-->

<androidx.constraintlayout.widget.ConstraintLayout
<androidx.core.widget.NestedScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:clipToPadding="true"
    android:clipChildren="true">
        <ScrollView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:scrollIndicators="top|bottom">
    android:layout_height="wrap_content">
        <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 layout="@layout/wifi_network_config"/>

                        <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"/>
                <include layout="@*android:layout/alert_dialog_button_bar_material"/>
        </LinearLayout>
        </ScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>
 No newline at end of file
</androidx.core.widget.NestedScrollView>
+1 −685

File changed.

Preview size limit exceeded, changes collapsed.

+699 −0

File added.

Preview size limit exceeded, changes collapsed.