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

Merge "Fixing the crash when tapping the "Downloaded apps" in Accessibility page." into sc-dev am: 90f780ac51

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

Change-Id: I1551aed4e47842c77feb2552a5cb6a5b60a92d5e
This commit is contained in:
TreeHugger Robot
2021-06-12 10:31:03 +00:00
committed by Automerger Merge Worker
parent 8e3d8a3935 90f780ac51
commit 4195e8c488
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
View File

@@ -78,10 +78,12 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature
// Settings animated image. // Settings animated image.
final int animatedImageRes = arguments.getInt( final int animatedImageRes = arguments.getInt(
AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES); AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE) if (animatedImageRes > 0) {
.authority(mComponentName.getPackageName()) mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.appendPath(String.valueOf(animatedImageRes)) .authority(mComponentName.getPackageName())
.build(); .appendPath(String.valueOf(animatedImageRes))
.build();
}
// Settings html description. // Settings html description.
mHtmlDescription = arguments.getCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION); mHtmlDescription = arguments.getCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION);

10
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

@@ -396,10 +396,12 @@ public class ToggleAccessibilityServicePreferenceFragment extends
// Settings animated image. // Settings animated image.
final int animatedImageRes = arguments.getInt( final int animatedImageRes = arguments.getInt(
AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES); AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE) if (animatedImageRes > 0) {
.authority(mComponentName.getPackageName()) mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.appendPath(String.valueOf(animatedImageRes)) .authority(mComponentName.getPackageName())
.build(); .appendPath(String.valueOf(animatedImageRes))
.build();
}
// Get Accessibility service name. // Get Accessibility service name.
mPackageName = getAccessibilityServiceInfo().getResolveInfo().loadLabel( mPackageName = getAccessibilityServiceInfo().getResolveInfo().loadLabel(