Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change ScrollView to NestedScrollView for screen 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 cbfeb8bf01 1b37291364
commit d7ce9a6534
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,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"
@@ -106,5 +106,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>

2
res/layout/preview_seek_bar_view_pager.xml
View File

@@ -25,7 +25,7 @@
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/preview_pager" android:id="@+id/preview_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="400dp"
android:layout_weight="1" android:layout_weight="1"
android:background="?android:attr/colorBackgroundFloating" android:background="?android:attr/colorBackgroundFloating"
android:contentDescription="@string/preview_pager_content_description" /> android:contentDescription="@string/preview_pager_content_description" />

25
res/layout/screen_zoom_activity.xml
View File

@@ -14,17 +14,18 @@
limitations under the License. limitations under the License.
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent" android:layout_width="match_parent"
android:fillViewport="true"> android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content">
<include layout="@layout/preview_seek_bar_view_pager" /> <include layout="@layout/preview_seek_bar_view_pager"/>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
@@ -40,7 +41,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="6dp" /> android:padding="6dp"/>
<TextView <TextView
android:id="@+id/current_label" android:id="@+id/current_label"
@@ -49,7 +50,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="6dp" android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -66,7 +67,7 @@
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"
android:contentDescription="@string/screen_zoom_make_smaller_desc" /> android:contentDescription="@string/screen_zoom_make_smaller_desc"/>
<com.android.settings.widget.LabeledSeekBar <com.android.settings.widget.LabeledSeekBar
android:id="@+id/seek_bar" android:id="@+id/seek_bar"
@@ -85,7 +86,7 @@
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
android:focusable="true" android:focusable="true"
android:contentDescription="@string/screen_zoom_make_larger_desc" /> android:contentDescription="@string/screen_zoom_make_larger_desc"/>
</LinearLayout> </LinearLayout>
<TextView <TextView
@@ -93,7 +94,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/screen_zoom_summary" android:text="@string/screen_zoom_summary"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
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/screen_zoom_preview_1.xml
View File

@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
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"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -75,4 +76,4 @@
app:iconBackgroundColor="@color/message_icon_background_incoming" /> app:iconBackgroundColor="@color/message_icon_background_incoming" />
</LinearLayout> </LinearLayout>
</view> </view>
</ScrollView> </androidx.core.widget.NestedScrollView>

5
res/layout/screen_zoom_preview_settings.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"
@@ -223,4 +224,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</view> </view>
</ScrollView> </androidx.core.widget.NestedScrollView>