diff options
author | Tony Wickham <twickham@google.com> | 2016-07-13 17:05:52 -0700 |
---|---|---|
committer | Tony <twickham@google.com> | 2016-07-19 13:53:26 -0700 |
commit | 2c99d2ceebd1a6b6fed2b71105b8fdf88ef26a33 (patch) | |
tree | bcd7528b51bf7a2baba7a74d27b66afff439dd0c /src/com/android/launcher3/shortcuts/DeepShortcutManager.java | |
parent | 2f3b0b7e3b634d7e17f457c961e5a7acd9bf71ee (diff) | |
download | android_packages_apps_Trebuchet-2c99d2ceebd1a6b6fed2b71105b8fdf88ef26a33.tar.gz android_packages_apps_Trebuchet-2c99d2ceebd1a6b6fed2b71105b8fdf88ef26a33.tar.bz2 android_packages_apps_Trebuchet-2c99d2ceebd1a6b6fed2b71105b8fdf88ef26a33.zip |
Implement ranking for shortcuts.
- Manifest shortcuts are closest to the original icon, in rank order,
followed by dynamic shortcuts in rank order.
- Also prevent pinned shortcuts from showing in container if they
aren't also dynamic (only manifest and dynamic show in container).
Bug: 29822383
Bug: 29946657
Change-Id: I5cdb2ef3700daedca01987f64c245beb3f4aa5ee
Diffstat (limited to 'src/com/android/launcher3/shortcuts/DeepShortcutManager.java')
-rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutManager.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java index 66e98cd42..450c36df4 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java @@ -81,11 +81,13 @@ public class DeepShortcutManager { } /** - * Gets all the shortcuts associated with the given package and user. + * Gets all the manifest and dynamic shortcuts associated with the given package and user, + * to be displayed in the shortcuts container on long press. */ - public List<ShortcutInfoCompat> queryForAllAppShortcuts(ComponentName activity, + public List<ShortcutInfoCompat> queryForShortcutsContainer(ComponentName activity, List<String> ids, UserHandleCompat user) { - return query(FLAG_GET_ALL, activity.getPackageName(), activity, ids, user); + return query(FLAG_MATCH_MANIFEST | FLAG_MATCH_DYNAMIC, + activity.getPackageName(), activity, ids, user); } /** |