diff options
author | Tony Wickham <twickham@google.com> | 2016-05-19 11:19:39 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-06-21 15:49:16 -0700 |
commit | bfbf7f9f4a0b300613f0ff27a4eb592d88c08325 (patch) | |
tree | 6906865484b6a03199eecd0f352eba24345af33e /src/com/android/launcher3/ShortcutInfo.java | |
parent | ae50284e0a838139c67caf0064a0977c871497fa (diff) | |
download | android_packages_apps_Trebuchet-bfbf7f9f4a0b300613f0ff27a4eb592d88c08325.tar.gz android_packages_apps_Trebuchet-bfbf7f9f4a0b300613f0ff27a4eb592d88c08325.tar.bz2 android_packages_apps_Trebuchet-bfbf7f9f4a0b300613f0ff27a4eb592d88c08325.zip |
Add support for launcher shortcuts.
- This CL has no UI but provides the necessary backing for one.
- Adds new item type: ITEM_TYPE_DEEP_SHORTCUT, to distinguish from
ITEM_TYPE_SHORTCUT. We can reconsider these names.
- Adds ShortcutCache, using LruCache for up to 30 dynamic shortcuts
(pinned shortcuts are always cached in a HashMap).
- DeepShortcutManager queries for shortcuts and other things like
pin them. In a future CL it will use the cache, but for now it
simply makes an RPC for all queries.
- LauncherModel maintains counts for pinned shortcuts, pinning and
unpinning when counts reach 1 or 0, respectively.
- LauncherModel maintains a map of components to lists of shortcut ids,
which Launcher gets a copy of after it is changed in the background.
This will allow us to know how many shortcuts an app has immediately,
and query for details as the UI is animating.
Change-Id: Ic526f374dd10d72a261bae67f07f098fca8d8bca
Diffstat (limited to 'src/com/android/launcher3/ShortcutInfo.java')
-rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 49 |
1 files changed, 46 insertions, 3 deletions
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index d051665f3..63f49e0d5 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -16,20 +16,23 @@ package com.android.launcher3; +import android.annotation.TargetApi; import android.content.ComponentName; import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; -import android.util.Log; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.text.TextUtils; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.compat.LauncherActivityInfoCompat; +import com.android.launcher3.compat.LauncherAppsCompat; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.folder.FolderIcon; - -import java.util.ArrayList; +import com.android.launcher3.shortcuts.ShortcutInfoCompat; /** * Represents a launchable icon on the workspaces and in folders. @@ -274,6 +277,46 @@ public class ShortcutInfo extends ItemInfo { return shortcut; } + /** + * Creates a {@link ShortcutInfo} from a {@link ShortcutInfoCompat}. Pardon the overloaded name. + */ + @TargetApi(Build.VERSION_CODES.N) + public static ShortcutInfo fromDeepShortcutInfo(ShortcutInfoCompat shortcutInfo, + Context context, LauncherAppsCompat launcherApps) { + ShortcutInfo si = new ShortcutInfo(); + si.user = shortcutInfo.getUserHandle(); + si.itemType = LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT; + si.intent = shortcutInfo.makeIntent(context); + si.flags = 0; + si.updateFromDeepShortcutInfo(shortcutInfo, context, launcherApps); + return si; + } + + public void updateFromDeepShortcutInfo(ShortcutInfoCompat shortcutInfo, + Context context, LauncherAppsCompat launcherApps) { + title = shortcutInfo.getShortLabel(); + + CharSequence label = shortcutInfo.getLongLabel(); + if (TextUtils.isEmpty(label)) { + label = shortcutInfo.getShortLabel(); + } + this.contentDescription = UserManagerCompat.getInstance(context) + .getBadgedLabelForUser(label, user); + + LauncherAppState launcherAppState = LauncherAppState.getInstance(); + Drawable unbadgedIcon = launcherApps.getShortcutIconDrawable(shortcutInfo, launcherAppState + .getInvariantDeviceProfile().fillResIconDpi); + Bitmap icon = unbadgedIcon == null ? null + : Utilities.createBadgedIconBitmap(unbadgedIcon, user, context); + setIcon(icon != null ? icon : launcherAppState.getIconCache().getDefaultIcon(user)); + } + + /** Returns the ShortcutInfo id associated with the deep shortcut. */ + public String getDeepShortcutId() { + return itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT ? + intent.getStringExtra(ShortcutInfoCompat.EXTRA_SHORTCUT_ID) : null; + } + @Override public boolean isDisabled() { return isDisabled != 0; |