summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/SearchDropTargetBar.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-03-01 16:09:54 -0800
committerWinson Chung <winsonc@google.com>2012-03-20 15:18:05 -0700
commit043f2af567178b82b0b41f12d379e7dd12da2936 (patch)
treefc097bc1c6baeee546d3683a2b8ecb05976e2370 /src/com/android/launcher2/SearchDropTargetBar.java
parentd1eef3388a518696521ec8d67022c0bf09eef796 (diff)
downloadandroid_packages_apps_Trebuchet-043f2af567178b82b0b41f12d379e7dd12da2936.tar.gz
android_packages_apps_Trebuchet-043f2af567178b82b0b41f12d379e7dd12da2936.tar.bz2
android_packages_apps_Trebuchet-043f2af567178b82b0b41f12d379e7dd12da2936.zip
Adding fling-to-delete.
- Also fixing issue where the drop target icon changes color slower than the text. Change-Id: I0bfa59da5d202016342f1c3de419ebcafd81ff6f
Diffstat (limited to 'src/com/android/launcher2/SearchDropTargetBar.java')
-rw-r--r--src/com/android/launcher2/SearchDropTargetBar.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher2/SearchDropTargetBar.java
index 03ca38fb4..76d707618 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher2/SearchDropTargetBar.java
@@ -69,6 +69,7 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
dragController.addDragListener(mDeleteDropTarget);
dragController.addDropTarget(mInfoDropTarget);
dragController.addDropTarget(mDeleteDropTarget);
+ dragController.setFlingToDeleteDropTarget(mDeleteDropTarget);
mInfoDropTarget.setLauncher(launcher);
mDeleteDropTarget.setLauncher(launcher);
}
@@ -153,6 +154,13 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D
});
}
+ public void finishAnimations() {
+ mDropTargetBarFadeInAnim.end();
+ mDropTargetBarFadeOutAnim.end();
+ mQSBSearchBarFadeInAnim.end();
+ mQSBSearchBarFadeOutAnim.end();
+ }
+
private void cancelAnimations() {
mDropTargetBarFadeInAnim.cancel();
mDropTargetBarFadeOutAnim.cancel();