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

Commit 7e47784d authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Fix Voice Access scroll down in the Add network 

Use single NestedScrollView instead of ScrollView + NestedScrollView.

This also improve the scroll experience when the accessibility service
is off.

Bug: 216573764
Test: manual test when Voice Access on
Change-Id: I9395c1749c9f49086a979057f7ea2f0cda857993
parent 22cda477

res/layout/wifi_add_network_view.xml

+8 −28
Original line number Original line Diff line number Diff line
@@ -15,36 +15,16 @@ 
     limitations under the License.

     limitations under the License.

-->

-->





<androidx.constraintlayout.widget.ConstraintLayout

<androidx.core.widget.NestedScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    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_width="match_parent"

    android:layout_height="wrap_content"

    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">

        <LinearLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            android:orientation="vertical">

                        <include

                <include layout="@layout/wifi_network_config"/>

                            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

                <include layout="@*android:layout/alert_dialog_button_bar_material"/>

                            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>

        </LinearLayout>

        </ScrollView>

</androidx.core.widget.NestedScrollView>
 


</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file

res/layout/wifi_dialog.xml

+1 −685

File changed.

Preview size limit exceeded, changes collapsed.

res/layout/wifi_network_config.xml

0 → 100644
+699 −0

File added.

Preview size limit exceeded, changes collapsed.