Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the duplicate components in edit shortcut menu list." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-27 01:33:38 +00:00
committed by Android (Google) Code Review
parent e71b44a8e5 ee74b0ea90
commit 22a0b13e5d
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java
View File

@@ -169,13 +169,41 @@ public class AccessibilityButtonChooserActivity extends Activity {
private static List<AccessibilityButtonTarget> getInstalledServiceTargets(
@NonNull Context context) {
final List<AccessibilityButtonTarget> targets = new ArrayList<>();
targets.addAll(getAccessibilityServiceTargets(context));
targets.addAll(getAccessibilityActivityTargets(context));
targets.addAll(getAccessibilityFilteredTargets(context));
targets.addAll(getWhiteListingServiceTargets(context));
return targets;
}
private static List<AccessibilityButtonTarget> getAccessibilityFilteredTargets(
@NonNull Context context) {
final List<AccessibilityButtonTarget> serviceTargets =
getAccessibilityServiceTargets(context);
final List<AccessibilityButtonTarget> activityTargets =
getAccessibilityActivityTargets(context);
for (AccessibilityButtonTarget activityTarget : activityTargets) {
serviceTargets.removeIf(serviceTarget -> {
final ComponentName serviceComponentName =
ComponentName.unflattenFromString(serviceTarget.getId());
final ComponentName activityComponentName =
ComponentName.unflattenFromString(activityTarget.getId());
final boolean isSamePackageName = activityComponentName.getPackageName().equals(
serviceComponentName.getPackageName());
final boolean isSameLabel = activityTarget.getLabel().equals(
serviceTarget.getLabel());
return isSamePackageName && isSameLabel;
});
}
final List<AccessibilityButtonTarget> targets = new ArrayList<>();
targets.addAll(serviceTargets);
targets.addAll(activityTargets);
return targets;
}
private static List<AccessibilityButtonTarget> getAccessibilityServiceTargets(
@NonNull Context context) {
final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);