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

Commit dda4c34d authored by Mill Chen's avatar Mill Chen
Browse files

Update ScrollView to NestedScrollView in the font size page 

To ensure that the collapsing toolbar work as usual, we need to change
the ScrollView to NestedScrollView.

Bug: 176884647
Test: manual test and visual verified
1) Navigate to Settings -> Display -> Font size
2) Check if the sample text area is scrollable

Change-Id: I1cb8a20f1efd69213e1eaadfe84a53aff9bc640f
parent 90c976b8

res/layout-sw300dp-land/font_size_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            android:padding="6dp" />

    </LinearLayout>



    <ScrollView

    <androidx.core.widget.NestedScrollView

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="match_parent"
@@ -104,5 +104,5 @@ 
                android:layout_marginBottom="16dp"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />

        </LinearLayout>

    </ScrollView>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>

res/layout/font_size_activity.xml

+13 −12
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true">
@@ -98,4 +99,4 @@ 
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>

        </LinearLayout>

    </LinearLayout>

</ScrollView>
 
</androidx.core.widget.NestedScrollView>

res/layout/font_size_preview.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     limitations under the License.

-->



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

<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true" >
@@ -57,4 +58,4 @@ 
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>

        </LinearLayout>

    </view>

</ScrollView>
 
</androidx.core.widget.NestedScrollView>