summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-03-11 01:10:19 -0800
committerSunny Goyal <sunnygoyal@google.com>2016-03-22 13:57:58 -0700
commitd5bd67dfa9ee5fda2384a75231b7a68ceb8e9bd5 (patch)
tree0b6423d82af60515f56eaf1b18909929942b4b80 /src/com/android/launcher3/folder
parentd3cc05a3a8c573986d08ee293a4bb8b4534d06b2 (diff)
downloadandroid_packages_apps_Trebuchet-d5bd67dfa9ee5fda2384a75231b7a68ceb8e9bd5.tar.gz
android_packages_apps_Trebuchet-d5bd67dfa9ee5fda2384a75231b7a68ceb8e9bd5.tar.bz2
android_packages_apps_Trebuchet-d5bd67dfa9ee5fda2384a75231b7a68ceb8e9bd5.zip
Adding support for result callback when starting uninstall-application activity
Change-Id: Ieaca4fbd0ae0156f24c8863ccbef61d4d6d30ba1
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r--src/com/android/launcher3/folder/Folder.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index 9fdb29506..e66523dcb 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -71,9 +71,8 @@ import com.android.launcher3.OnAlarmListener;
import com.android.launcher3.R;
import com.android.launcher3.ShortcutInfo;
import com.android.launcher3.Stats;
-import com.android.launcher3.UninstallDropTarget.UninstallSource;
+import com.android.launcher3.UninstallDropTarget.DropTargetSource;
import com.android.launcher3.Utilities;
-import com.android.launcher3.Workspace;
import com.android.launcher3.Workspace.ItemOperator;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource;
import com.android.launcher3.config.FeatureFlags;
@@ -92,7 +91,7 @@ import java.util.Comparator;
*/
public class Folder extends LinearLayout implements DragSource, View.OnClickListener,
View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener,
- View.OnFocusChangeListener, DragListener, UninstallSource, AccessibilityDragSource,
+ View.OnFocusChangeListener, DragListener, DropTargetSource, AccessibilityDragSource,
Stats.LaunchSourceProvider {
private static final String TAG = "Launcher.Folder";
@@ -980,7 +979,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
}
@Override
- public void onUninstallActivityReturned(boolean success) {
+ public void onDragObjectRemoved(boolean success) {
mDeferDropAfterUninstall = false;
mUninstallSuccessful = success;
if (mDeferredAction != null) {