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

Merge "Sharesheet - Fix regression in direct share sorting" into qt-dev

Browse Source 
am: ac1c8ddcc3

Change-Id: Ib664b368f34d3ee936444ce784326300ef260372
This commit is contained in:
Matt Pietal
2019-07-02 10:26:37 -07:00
committed by android-build-merger
parent 4c2600abe1 ac1c8ddcc3
commit 3d1f220698
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1534,7 +1534,11 @@ public class ChooserActivity extends ResolverActivity {
if (driList.get(i).getResolvedComponentName().equals( if (driList.get(i).getResolvedComponentName().equals(
resultList.get(j).getTargetComponent())) { resultList.get(j).getTargetComponent())) {
ShortcutManager.ShareShortcutInfo shareShortcutInfo = resultList.get(j); ShortcutManager.ShareShortcutInfo shareShortcutInfo = resultList.get(j);
ChooserTarget chooserTarget = convertToChooserTarget(shareShortcutInfo); // Incoming results are ordered but without a score. Create a score
// based on the index in order to be sorted appropriately when joined
// with legacy direct share api results.
float score = Math.max(1.0f - (0.05f * j), 0.0f);
ChooserTarget chooserTarget = convertToChooserTarget(shareShortcutInfo, score);
chooserTargets.add(chooserTarget); chooserTargets.add(chooserTarget);
if (mDirectShareAppTargetCache != null && appTargets != null) { if (mDirectShareAppTargetCache != null && appTargets != null) {
mDirectShareAppTargetCache.put(chooserTarget, appTargets.get(j)); mDirectShareAppTargetCache.put(chooserTarget, appTargets.get(j));
@@ -1580,7 +1584,8 @@ public class ChooserActivity extends ResolverActivity {
return false; return false;
} }
private ChooserTarget convertToChooserTarget(ShortcutManager.ShareShortcutInfo shareShortcut) { private ChooserTarget convertToChooserTarget(ShortcutManager.ShareShortcutInfo shareShortcut,
float score) {
ShortcutInfo shortcutInfo = shareShortcut.getShortcutInfo(); ShortcutInfo shortcutInfo = shareShortcut.getShortcutInfo();
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId()); extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId());
@@ -1591,7 +1596,7 @@ public class ChooserActivity extends ResolverActivity {
null, null,
// The ranking score for this target (0.0-1.0); the system will omit items with low // The ranking score for this target (0.0-1.0); the system will omit items with low
// scores when there are too many Direct Share items. // scores when there are too many Direct Share items.
1.0f, score,
// The name of the component to be launched if this target is chosen. // The name of the component to be launched if this target is chosen.
shareShortcut.getTargetComponent().clone(), shareShortcut.getTargetComponent().clone(),
// The extra values here will be merged into the Intent when this target is chosen. // The extra values here will be merged into the Intent when this target is chosen.