diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-04 00:45:37 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-04 16:21:20 +0200 |
commit | eadbfc564d84aaf1d800da3d0d6edf6312f89648 (patch) | |
tree | 8bb3858af8f7e2d7bbcf8ccff4b8904856d1c376 /src/com/android/launcher3/DeleteDropTarget.java | |
parent | 8b3cd79082043a08c319f1550679d4078b7d509c (diff) | |
download | android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.tar.gz android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.tar.bz2 android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.zip |
Move wallpapers to external activity
Also renaming Launcher's ApplicationInfo to
AppInfo since ApplicationInfo is already a
framework class
Change-Id: Ib3e91d2ba4ace458d790a26c0ce850870fd3f146
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 01edb9eb6..09fad8378 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -96,7 +96,7 @@ public class DeleteDropTarget extends ButtonDropTarget { } private boolean isAllAppsApplication(DragSource source, Object info) { - return (source instanceof AppsCustomizePagedView) && (info instanceof ApplicationInfo); + return (source instanceof AppsCustomizePagedView) && (info instanceof AppInfo); } private boolean isAllAppsWidget(DragSource source, Object info) { if (source instanceof AppsCustomizePagedView) { @@ -149,7 +149,7 @@ public class DeleteDropTarget extends ButtonDropTarget { item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION && item instanceof ShortcutInfo) { ShortcutInfo shortcutInfo = (ShortcutInfo) info; - return (shortcutInfo.flags & ApplicationInfo.DOWNLOADED_FLAG) != 0; + return (shortcutInfo.flags & AppInfo.DOWNLOADED_FLAG) != 0; } } return false; @@ -259,14 +259,14 @@ public class DeleteDropTarget extends ButtonDropTarget { mWaitingForUninstall = false; if (isAllAppsApplication(d.dragSource, item)) { // Uninstall the application if it is being dragged from AppsCustomize - ApplicationInfo appInfo = (ApplicationInfo) item; + AppInfo appInfo = (AppInfo) item; mLauncher.startApplicationUninstallActivity(appInfo.componentName, appInfo.flags); } else if (AppsCustomizePagedView.DISABLE_ALL_APPS && isWorkspaceOrFolderApplication(d)) { ShortcutInfo shortcut = (ShortcutInfo) item; if (shortcut.intent != null && shortcut.intent.getComponent() != null) { final ComponentName componentName = shortcut.intent.getComponent(); final DragSource dragSource = d.dragSource; - int flags = ApplicationInfo.initFlags( + int flags = AppInfo.initFlags( ShortcutInfo.getPackageInfo(getContext(), componentName.getPackageName())); mWaitingForUninstall = mLauncher.startApplicationUninstallActivity(componentName, flags); |