Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844df5 am: 39911eee17

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

Change-Id: Ib2e1225408a04bad0880dc45903962a47ab1f788
This commit is contained in:
PETER LIANG
2021-06-14 03:30:14 +00:00
committed by Automerger Merge Worker
6 changed files with 8619 additions and 2 deletions

View File

@@ -80,7 +80,7 @@ public class ToggleColorInversionPreferenceFragment extends
mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.drawable.accessibility_color_inversion_banner))
.appendPath(String.valueOf(R.raw.accessibility_color_inversion_banner))
.build();
final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
enableServiceFeatureKeys.add(ENABLED);

View File

@@ -89,7 +89,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
mPackageName = getString(R.string.accessibility_screen_magnification_title);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(getPrefContext().getPackageName())
.appendPath(String.valueOf(R.drawable.accessibility_magnification_banner))
.appendPath(String.valueOf(R.raw.accessibility_magnification_banner))
.build();
mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
removeDialog(DialogEnums.EDIT_SHORTCUT);