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

Merge "Update the default score for direct share targets." into rvc-dev am: 060eff0716

Browse Source 
Change-Id: I041e300aae9f279c8f5e9445780e636dffd1d8de
This commit is contained in:
Song Hu
2020-06-01 19:09:24 +00:00
committed by Automerger Merge Worker
parent c635db5b80 060eff0716
commit b07bb870c8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/ChooserListAdapter.java
View File

@@ -80,6 +80,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
private static final int MAX_SUGGESTED_APP_TARGETS = 4; private static final int MAX_SUGGESTED_APP_TARGETS = 4;
private static final int MAX_CHOOSER_TARGETS_PER_APP = 2; private static final int MAX_CHOOSER_TARGETS_PER_APP = 2;
private static final int MAX_SERVICE_TARGET_APP = 8; private static final int MAX_SERVICE_TARGET_APP = 8;
private static final int DEFAULT_DIRECT_SHARE_RANKING_SCORE = 1000;
static final int MAX_SERVICE_TARGETS = 8; static final int MAX_SERVICE_TARGETS = 8;
@@ -564,11 +565,13 @@ public class ChooserListAdapter extends ResolverListAdapter {
} }
Map<String, Integer> scores = mChooserTargetScores.get(componentName); Map<String, Integer> scores = mChooserTargetScores.get(componentName);
Collections.sort(mParkingDirectShareTargets.get(componentName).first, (o1, o2) -> { Collections.sort(mParkingDirectShareTargets.get(componentName).first, (o1, o2) -> {
// The score has been normalized between 0 and 2, the default is 1. // The score has been normalized between 0 and 2000, the default is 1000.
int score1 = scores.getOrDefault( int score1 = scores.getOrDefault(
ChooserUtil.md5(o1.getChooserTarget().getTitle().toString()), 1); ChooserUtil.md5(o1.getChooserTarget().getTitle().toString()),
DEFAULT_DIRECT_SHARE_RANKING_SCORE);
int score2 = scores.getOrDefault( int score2 = scores.getOrDefault(
ChooserUtil.md5(o2.getChooserTarget().getTitle().toString()), 1); ChooserUtil.md5(o2.getChooserTarget().getTitle().toString()),
DEFAULT_DIRECT_SHARE_RANKING_SCORE);
return score2 - score1; return score2 - score1;
}); });
} }