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

Commit e732adcd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update ScrollView to NestedScrollView in the font size page"

parents d7ce9a65 dda4c34d

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>