diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-04-10 13:45:42 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-04-16 15:52:04 -0700 |
commit | fa401a10e7e9341daf6f3c5949bf9331902c26d0 (patch) | |
tree | 28e3834dee3afe2acfed418a05a599541ceacb6d /src/com/android/launcher3/LauncherModel.java | |
parent | fb9ca2392894a3dea83570267f9597ac0750b9fd (diff) | |
download | android_packages_apps_Trebuchet-fa401a10e7e9341daf6f3c5949bf9331902c26d0.tar.gz android_packages_apps_Trebuchet-fa401a10e7e9341daf6f3c5949bf9331902c26d0.tar.bz2 android_packages_apps_Trebuchet-fa401a10e7e9341daf6f3c5949bf9331902c26d0.zip |
Updating drop button targets
> Splitting DeleteDropTarget into delete and uninstall
> Showing UninstallDropTarget for app shortcuts on workspace
> Showing InfoDropTarget only when developer options is enabled
Change-Id: I4396571d2199d1581bb9c733aef88ab9b0ebd79d
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 37f1ea86e..f7df6bc1a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1079,7 +1079,7 @@ public class LauncherModel extends BroadcastReceiver * @param context * @param item */ - static void deleteItemFromDatabase(Context context, final ItemInfo item) { + public static void deleteItemFromDatabase(Context context, final ItemInfo item) { ArrayList<ItemInfo> items = new ArrayList<ItemInfo>(); items.add(item); deleteItemsFromDatabase(context, items); @@ -1185,7 +1185,7 @@ public class LauncherModel extends BroadcastReceiver /** * Remove the contents of the specified folder from the database */ - static void deleteFolderContentsFromDatabase(Context context, final FolderInfo info) { + public static void deleteFolderContentsFromDatabase(Context context, final FolderInfo info) { final ContentResolver cr = context.getContentResolver(); Runnable r = new Runnable() { @@ -3106,6 +3106,9 @@ public class LauncherModel extends BroadcastReceiver si.status &= ~ShortcutInfo.FLAG_RESTORED_ICON & ~ShortcutInfo.FLAG_AUTOINTALL_ICON & ~ShortcutInfo.FLAG_INSTALL_SESSION_ACTIVE; + if (appInfo != null) { + si.flags = appInfo.flags; + } infoUpdated = true; si.updateIcon(mIconCache); @@ -3414,6 +3417,9 @@ public class LauncherModel extends BroadcastReceiver info.user = user; info.contentDescription = mUserManager.getBadgedLabelForUser( info.title.toString(), info.user); + if (lai != null) { + info.flags = AppInfo.initFlags(lai); + } return info; } |