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

Merge "Sharesheet - Fix shortcut ranking logic" into qt-dev

Browse Source 
am: 99e622c232

Change-Id: I6bf435b44b2d63a0e645dbbb4be0dfd84047225d
This commit is contained in:
Matt Pietal
2019-05-10 10:06:08 -07:00
committed by android-build-merger
parent 2e3702f579 99e622c232
commit 1db23d3020
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ public class ChooserActivity extends ResolverActivity {
/** {@link ChooserActivity#getBaseScore} */
private static final float CALLER_TARGET_SCORE_BOOST = 900.f;
/** {@link ChooserActivity#getBaseScore} */
private static final float SHORTCUT_TARGET_SCORE_BOOST = 10.f;
private static final float SHORTCUT_TARGET_SCORE_BOOST = 90.f;
private static final String TARGET_DETAILS_FRAGMENT_TAG = "targetDetailsFragment";
// TODO: Update to handle landscape instead of using static value
private static final int MAX_RANKED_TARGETS = 4;
@@ -2477,10 +2477,11 @@ public class ChooserActivity extends ResolverActivity {
}
/**
* Use the scoring system along with artificial boosts to create up to 3 distinct buckets:
* Use the scoring system along with artificial boosts to create up to 4 distinct buckets:
* <ol>
* <li>App-supplied targets
* <li>Prediction manager targets or Shortcut API targets
* <li>Shortcuts ranked via App Prediction Manager
* <li>Shortcuts ranked via legacy heuristics
* <li>Legacy direct share targets
* </ol>
*/
@@ -2489,7 +2490,7 @@ public class ChooserActivity extends ResolverActivity {
return CALLER_TARGET_SCORE_BOOST;
}
if (getAppPredictorForDirectShareIfEnabled() != null) {
if (isShortcutResult && getAppPredictorForDirectShareIfEnabled() != null) {
return SHORTCUT_TARGET_SCORE_BOOST;
}