Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev (9ade901d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1679,6 +1679,10 @@
		android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
		</activity-alias>

		<activity
		android:name=".accessibility.AccessibilityScreenSizeForSetupWizardActivity"
		android:exported="false"/>

		<activity
		android:name="Settings$AccessibilityDaltonizerSettingsActivity"
		android:exported="true"

res/layout/accessibility_screen_size_setup_wizard.xml

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<com.google.android.setupdesign.GlifLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:icon="@drawable/ic_accessibility_visibility"
		app:sucHeaderText="@string/title_font_size"
		app:sudDescriptionText="@string/short_summary_font_size">

		<FrameLayout
		android:id="@+id/content_frame"
		android:layout_marginTop="@dimen/preview_size_top_margin"
		android:layout_width="match_parent"
		android:layout_height="match_parent"/>
		</com.google.android.setupdesign.GlifLayout>
		No newline at end of file

res/layout/suw_font_size_fragment.xml

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<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">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

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

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<com.android.settings.widget.DotsPageIndicator
		android:id="@+id/page_indicator"
		style="@style/PreviewPagerPageIndicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:padding="3dp"/>

		<TextView
		android:id="@+id/current_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:padding="6dp"
		android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
		android:elevation="2dp"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical"
		android:paddingTop="8dp">

		<ImageView
		android:id="@+id/smaller"
		android:src="@drawable/ic_font_size_16dp"
		android:contentDescription="@string/font_size_make_smaller_desc"
		style="@style/screen_size_imageview_style"/>

		<com.android.settings.widget.LabeledSeekBar
		android:id="@+id/seek_bar"
		android:layout_width="0dp"
		android:layout_height="48dp"
		android:layout_weight="1"
		style="@android:style/Widget.Material.SeekBar.Discrete"/>

		<ImageView
		android:id="@+id/larger"
		android:src="@drawable/ic_font_size_24dp"
		android:contentDescription="@string/font_size_make_larger_desc"
		style="@style/screen_size_imageview_style"/>
		</LinearLayout>

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/font_size_summary"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
		</LinearLayout>
		</LinearLayout>
		</androidx.core.widget.NestedScrollView>

res/layout/suw_preview_seek_bar_view_pager.xml

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingStart="@dimen/preview_pager_padding"
		android:paddingEnd="@dimen/preview_pager_padding"
		android:background="@drawable/preview_seek_bar_outline" >

		<androidx.viewpager.widget.ViewPager
		android:id="@+id/preview_pager"
		android:layout_width="match_parent"
		android:layout_height="200dp"
		android:layout_weight="1"
		android:background="?android:attr/colorBackground"
		android:contentDescription="@string/preview_pager_content_description" />

		<TextView
		android:layout_width="match_parent"
		android:layout_height="36dp"
		android:paddingStart="32dp"
		android:gravity="start\|center"
		android:text="@string/screen_zoom_preview_title"
		android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
		android:importantForAccessibility="no" />
		</LinearLayout>

res/layout/suw_screen_zoom_fragment.xml

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<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">

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

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

		<LinearLayout
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

		<com.android.settings.widget.DotsPageIndicator
		android:id="@+id/page_indicator"
		style="@style/PreviewPagerPageIndicator"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:padding="3dp"/>

		<TextView
		android:id="@+id/current_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:padding="6dp"
		android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
		android:elevation="2dp"/>

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical">

		<ImageView
		android:id="@+id/smaller"
		android:src="@drawable/ic_remove_24dp"
		android:contentDescription="@string/screen_zoom_make_smaller_desc"
		style="@style/screen_size_imageview_style"/>

		<com.android.settings.widget.LabeledSeekBar
		android:id="@+id/seek_bar"
		android:layout_width="0dp"
		android:layout_height="48dp"
		android:layout_weight="1"
		style="@android:style/Widget.Material.SeekBar.Discrete"/>

		<ImageView
		android:id="@+id/larger"
		android:src="@drawable/ic_add_24dp"
		android:contentDescription="@string/screen_zoom_make_larger_desc"
		style="@style/screen_size_imageview_style"/>
		</LinearLayout>

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/screen_zoom_summary"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
		</LinearLayout>
		</LinearLayout>
		</androidx.core.widget.NestedScrollView>