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

Merge "Fix Settings app crashes when clicked on the magnification" into sc-v2-dev am: 6de9b2486f am: 6001f86910

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16044202

Change-Id: I841ede3f2254ffe42881ffb28880ae293dee42f9
This commit is contained in:
Menghan Li
2021-10-14 07:42:58 +00:00
committed by Automerger Merge Worker
parent 95f32177f8 6001f86910
commit ac4448c76b
6 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values-night/themes_suw.xml
View File

@@ -17,9 +17,6 @@
<!-- SUW related themes -->
<resources>
<!-- This theme was applied to Settings pages which are running under SUW. -->
<style name="SubSettings.SetupWizard" parent="SudThemeGlifV3" />
<!-- DayNight themes -->
<style name="GlifTheme.DayNight" parent="GlifTheme" />
<style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />

3
res/values/themes_suw.xml
View File

@@ -224,9 +224,6 @@
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<!-- This theme was applied to Settings pages which are running under SUW. -->
<style name="SubSettings.SetupWizard" parent="SudThemeGlifV3.Light" />
<!-- This theme was applied to Settings pages which are running under SUW with DynamicColor. -->
<style name="SudDynamicColorThemeSettings.SetupWizard" parent="SudDynamicColorThemeGlifV3.Light">
<item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle.SettingsLib</item>

5
res/xml/accessibility_settings_for_setup_wizard.xml
View File

@@ -35,12 +35,11 @@
settings:controller="com.android.settings.accessibility.ScreenSizePreferenceController" />
<Preference
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard"
android:key="screen_magnification_preference"
android:icon="@drawable/ic_accessibility_magnification"
android:summary="@string/accessibility_preference_magnification_summary"
android:title="@string/accessibility_screen_magnification_title"
settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
android:title="@string/accessibility_screen_magnification_title" />
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard"