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/InfoDropTarget.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/InfoDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/InfoDropTarget.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/launcher3/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java index db14e2e81..d831a3a03 100644 --- a/src/com/android/launcher3/InfoDropTarget.java +++ b/src/com/android/launcher3/InfoDropTarget.java @@ -96,9 +96,14 @@ public class InfoDropTarget extends UninstallDropTarget { // Only show the App Info drop target if developer settings are enabled. boolean developmentSettingsEnabled = Settings.Global.getInt(context.getContentResolver(), Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) == 1; - return developmentSettingsEnabled - && (info instanceof AppInfo || info instanceof ShortcutInfo - || info instanceof PendingAddItemInfo || info instanceof LauncherAppWidgetInfo) - && info.itemType != LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT; + if (!developmentSettingsEnabled) { + return false; + } + return info.itemType != LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT && + (info instanceof AppInfo || + (info instanceof ShortcutInfo && !((ShortcutInfo) info).isPromise()) || + (info instanceof LauncherAppWidgetInfo && + ((LauncherAppWidgetInfo) info).restoreStatus == 0) || + info instanceof PendingAddItemInfo); } } |