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

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

Change-Id: I9fdf101e209d7ade30c3da5850ed4499d7fcca3d
This commit is contained in:
Menghan Li
2021-10-14 07:32:01 +00:00
committed by Automerger Merge Worker
6 changed files with 9 additions and 18 deletions

View File

@@ -39,7 +39,8 @@ public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
final String title = getContext().getString(
R.string.accessibility_screen_magnification_title);
final String description = getContext().getString(R.string.accelerometer_title);
final String description = getContext().getString(
R.string.accessibility_preference_magnification_summary);
final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);
AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,
description, icon);

View File

@@ -40,8 +40,7 @@ public class ToggleScreenReaderPreferenceFragmentForSetupWizard
final GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
final String title = getArguments().getString(AccessibilitySettings.EXTRA_TITLE);
final String description = getContext().getString(
R.string.accessibility_screen_magnification_title);
final String description = getContext().getString(R.string.talkback_summary);
final Drawable icon = getContext().getDrawable(R.drawable.ic_accessibility_visibility);
AccessibilitySetupWizardUtils.updateGlifPreferenceLayout(getContext(), layout, title,
description, icon);