summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Folder.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-05-01 19:56:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-01 19:56:24 +0000
commit65832b6267053220e3c4b798db882a2f0641ad4d (patch)
treed97e1f094f63707f331425794e06773770ebf9be /src/com/android/launcher3/Folder.java
parentc45d9247eb1aae752b34ed3aeead007162cbd963 (diff)
parentddec73471eb6cc1f15eb9421a205bb2362509075 (diff)
downloadandroid_packages_apps_Trebuchet-65832b6267053220e3c4b798db882a2f0641ad4d.tar.gz
android_packages_apps_Trebuchet-65832b6267053220e3c4b798db882a2f0641ad4d.tar.bz2
android_packages_apps_Trebuchet-65832b6267053220e3c4b798db882a2f0641ad4d.zip
Merge "Updating fling to delete anim" into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r--src/com/android/launcher3/Folder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index ed8eea73f..a2828054c 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -841,7 +841,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
return true;
}
- public void onFlingToDelete(DragObject d, int x, int y, PointF vec) {
+ @Override
+ public void onFlingToDelete(DragObject d, PointF vec) {
// Do nothing
}