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

Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: c71b0edf6f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: I5e543d326bbe76941fe616462531a922ac7bbc90
This commit is contained in:
Alison Cichowlas
2020-06-22 17:04:12 +00:00
committed by Automerger Merge Worker
parent 5f20fc8f85 c71b0edf6f
commit f231e027f2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -691,8 +691,14 @@ public class ChooserActivity extends ResolverActivity implements
mPinnedSharedPrefs = getPinnedSharedPrefs(this); mPinnedSharedPrefs = getPinnedSharedPrefs(this);
pa = intent.getParcelableArrayExtra(Intent.EXTRA_EXCLUDE_COMPONENTS); pa = intent.getParcelableArrayExtra(Intent.EXTRA_EXCLUDE_COMPONENTS);
// Exclude out Nearby from main list if chip is present, to avoid duplication
ComponentName nearbySharingComponent = getNearbySharingComponent();
boolean hasNearby = nearbySharingComponent != null;
if (pa != null) { if (pa != null) {
ComponentName[] names = new ComponentName[pa.length]; ComponentName[] names = new ComponentName[pa.length + (hasNearby ? 1 : 0)];
for (int i = 0; i < pa.length; i++) { for (int i = 0; i < pa.length; i++) {
if (!(pa[i] instanceof ComponentName)) { if (!(pa[i] instanceof ComponentName)) {
Log.w(TAG, "Filtered component #" + i + " not a ComponentName: " + pa[i]); Log.w(TAG, "Filtered component #" + i + " not a ComponentName: " + pa[i]);
@@ -701,7 +707,14 @@ public class ChooserActivity extends ResolverActivity implements
} }
names[i] = (ComponentName) pa[i]; names[i] = (ComponentName) pa[i];
} }
if (hasNearby) {
names[names.length - 1] = nearbySharingComponent;
}
mFilteredComponentNames = names; mFilteredComponentNames = names;
} else if (hasNearby) {
mFilteredComponentNames = new ComponentName[1];
mFilteredComponentNames[0] = nearbySharingComponent;
} }
pa = intent.getParcelableArrayExtra(Intent.EXTRA_CHOOSER_TARGETS); pa = intent.getParcelableArrayExtra(Intent.EXTRA_CHOOSER_TARGETS);