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/DragController.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/DragController.java')
| -rw-r--r-- | src/com/android/launcher3/DragController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DragController.java b/src/com/android/launcher3/DragController.java index 07b25281b..f51366f86 100644 --- a/src/com/android/launcher3/DragController.java +++ b/src/com/android/launcher3/DragController.java @@ -327,13 +327,13 @@ public class DragController { } endDrag(); } - public void onAppsRemoved(ArrayList<ApplicationInfo> appInfos, Context context) { + public void onAppsRemoved(ArrayList<AppInfo> appInfos, Context context) { // Cancel the current drag if we are removing an app that we are dragging if (mDragObject != null) { Object rawDragInfo = mDragObject.dragInfo; if (rawDragInfo instanceof ShortcutInfo) { ShortcutInfo dragInfo = (ShortcutInfo) rawDragInfo; - for (ApplicationInfo info : appInfos) { + for (AppInfo info : appInfos) { // Added null checks to prevent NPE we've seen in the wild if (dragInfo != null && dragInfo.intent != null) { |