commit fa401a10e7e9341daf6f3c5949bf9331902c26d0
author Sunny Goyal <sunnygoyal@google.com> Fri Apr 10 13:45:42 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Apr 16 15:52:04 2015 -0700
tree 28e3834dee3afe2acfed418a05a599541ceacb6d
parent fb9ca2392894a3dea83570267f9597ac0750b9fd

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

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 1163324..c35ce94 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -51,6 +51,7 @@
 
 import com.android.launcher3.DragController.DragListener;
 import com.android.launcher3.FolderInfo.FolderListener;
+import com.android.launcher3.UninstallDropTarget.UninstallSource;
 import com.android.launcher3.Workspace.ItemOperator;
 import com.android.launcher3.util.Thunk;
 
@@ -62,7 +63,7 @@
  */
 public class Folder extends LinearLayout implements DragSource, View.OnClickListener,
         View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener,
-        View.OnFocusChangeListener, DragListener {
+        View.OnFocusChangeListener, DragListener, UninstallSource {
     private static final String TAG = "Launcher.Folder";
 
     /**
@@ -772,10 +773,12 @@
         updateItemLocationsInDatabaseBatch();
     }
 
+    @Override
     public void deferCompleteDropAfterUninstallActivity() {
         mDeferDropAfterUninstall = true;
     }
 
+    @Override
     public void onUninstallActivityReturned(boolean success) {
         mDeferDropAfterUninstall = false;
         mUninstallSuccessful = success;