aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 10:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simpifying uninstall drop target to check item type instead of class instance

Browse Source 
Bug: 64719848
Change-Id: I34c13b461e204fbdc2c5b4ed6fa92564ebd5439a
This commit is contained in:
Sunny Goyal
2017-08-15 12:54:42 -07:00
parent 492617f4c4
commit 1fe0c2ca08
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/launcher3/UninstallDropTarget.java
View File

@@ -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)