PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-12 02:14:38 +00:00
committed by Android (Google) Code Review
parent d7ce9a6534 dda4c34d59
commit e732adcd81
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-sw300dp-land/font_size_activity.xml
View File

@@ -36,7 +36,7 @@
android:padding="6dp" /> android:padding="6dp" />
</LinearLayout> </LinearLayout>
<ScrollView <androidx.core.widget.NestedScrollView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -104,5 +104,5 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
</LinearLayout> </LinearLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>
</LinearLayout> </LinearLayout>

5
res/layout/font_size_activity.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true"> android:fillViewport="true">
@@ -98,4 +99,4 @@
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>

5
res/layout/font_size_preview.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fillViewport="true" > android:fillViewport="true" >
@@ -57,4 +58,4 @@
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>
</LinearLayout> </LinearLayout>
</view> </view>
</ScrollView> </androidx.core.widget.NestedScrollView>