diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-08-15 20:45:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-15 20:45:33 +0000 |
commit | 67b2a21f456a44c6b0e6073ee9e2d3387e08f1f1 (patch) | |
tree | e15c41876d08f35073badee85314c8a8e5526b20 /src | |
parent | 10fcfb04b0d2ae8a0f69cfa406e6d7fbd594d29e (diff) | |
parent | 1fe0c2ca085a284936ac04fdb32b0cd9b82e9c4d (diff) | |
download | android_packages_apps_Trebuchet-67b2a21f456a44c6b0e6073ee9e2d3387e08f1f1.tar.gz android_packages_apps_Trebuchet-67b2a21f456a44c6b0e6073ee9e2d3387e08f1f1.tar.bz2 android_packages_apps_Trebuchet-67b2a21f456a44c6b0e6073ee9e2d3387e08f1f1.zip |
Merge "Simpifying uninstall drop target to check item type instead of class instance" into ub-launcher3-dorval-polish2
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/UninstallDropTarget.java | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/com/android/launcher3/UninstallDropTarget.java b/src/com/android/launcher3/UninstallDropTarget.java index 45c14d6bb..e15cf9f50 100644 --- a/src/com/android/launcher3/UninstallDropTarget.java +++ b/src/com/android/launcher3/UninstallDropTarget.java @@ -42,7 +42,7 @@ public class UninstallDropTarget extends ButtonDropTarget { return supportsDrop(getContext(), info); } - public static boolean supportsDrop(Context context, Object info) { + public static boolean supportsDrop(Context context, ItemInfo info) { UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE); Bundle restrictions = userManager.getUserRestrictions(); if (restrictions.getBoolean(UserManager.DISALLOW_APPS_CONTROL, false) @@ -56,21 +56,13 @@ public class UninstallDropTarget extends ButtonDropTarget { /** * @return the component name that should be uninstalled or null. */ - private static ComponentName getUninstallTarget(Context context, Object item) { + private static ComponentName getUninstallTarget(Context context, ItemInfo item) { Intent intent = null; UserHandle user = null; - if (item instanceof AppInfo) { - AppInfo info = (AppInfo) item; - intent = info.intent; - user = info.user; - } else if (item instanceof ShortcutInfo) { - ShortcutInfo info = (ShortcutInfo) item; - if (info.itemType == LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION) { - // Do not use restore/target intent here as we cannot uninstall an app which is - // being installed/restored. - intent = info.intent; - user = info.user; - } + if (item != null && + item.itemType == LauncherSettings.BaseLauncherColumns.ITEM_TYPE_APPLICATION) { + intent = item.getIntent(); + user = item.user; } if (intent != null) { LauncherActivityInfo info = LauncherAppsCompat.getInstance(context) |