diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-01-12 16:55:36 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-01-12 18:54:21 -0800 |
commit | e6e7200791c28472c9335a187a85dbeda1a77d24 (patch) | |
tree | 46bab436bccab7c4d545ea76b1348c7b5b172e20 /src/com/android/launcher3/ShortcutInfo.java | |
parent | 3e9be43b6ea75c8b82b57aa58508a0c3e8e1d721 (diff) | |
download | android_packages_apps_Trebuchet-e6e7200791c28472c9335a187a85dbeda1a77d24.tar.gz android_packages_apps_Trebuchet-e6e7200791c28472c9335a187a85dbeda1a77d24.tar.bz2 android_packages_apps_Trebuchet-e6e7200791c28472c9335a187a85dbeda1a77d24.zip |
Removing promiseIntent property from ShortuctInfo
> Instead of checking promiseIntent != null, using isPromise() for consistency
> Fixing bug where clicking a pending icon does not launch anything
> Fixing bug where draging an icon on Info target, permanently hides the icon
Change-Id: Ic8f6b56042dba42d5ed9aedb0f5947186e1a4208
Diffstat (limited to 'src/com/android/launcher3/ShortcutInfo.java')
-rw-r--r-- | src/com/android/launcher3/ShortcutInfo.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 8c83dff2b..c76217d3d 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -131,13 +131,6 @@ public class ShortcutInfo extends ItemInfoWithIcon { */ private int mInstallProgress; - /** - * If this shortcut is a placeholder, then intent will be a market intent for the package, and - * this will hold the original intent from the database. Otherwise, null. - * Refer {@link #FLAG_RESTORED_ICON}, {@link #FLAG_AUTOINTALL_ICON} - */ - public Intent promisedIntent; - public ShortcutInfo() { itemType = LauncherSettings.BaseLauncherColumns.ITEM_TYPE_SHORTCUT; } @@ -190,12 +183,9 @@ public class ShortcutInfo extends ItemInfoWithIcon { } } - /** - * Returns {@link #promisedIntent}, or {@link #intent} if promisedIntent is null. - */ @Override public Intent getIntent() { - return promisedIntent != null ? promisedIntent : intent; + return intent; } public boolean hasStatusFlag(int flag) { |