diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-16 18:05:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-16 18:05:17 +0000 |
| commit | c05d313e5adf67f29a4fa2a08f44ff9f53b3d6e4 (patch) | |
| tree | e512b23b502f166d5310be56340e8feafed46dae /src | |
| parent | 5e7af5d790d54a7c2ec85e29b75a741962846b0f (diff) | |
| parent | b605102cfd360d9f5d0f003aaf7839b5ebd176df (diff) | |
| download | android_packages_apps_Trebuchet-c05d313e5adf67f29a4fa2a08f44ff9f53b3d6e4.tar.gz android_packages_apps_Trebuchet-c05d313e5adf67f29a4fa2a08f44ff9f53b3d6e4.tar.bz2 android_packages_apps_Trebuchet-c05d313e5adf67f29a4fa2a08f44ff9f53b3d6e4.zip | |
Merge "Solve fling-to-delete bug" into jb-ub-now-indigo-rose
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/SearchDropTargetBar.java | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 63cb9ac28..56f595c74 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -530,8 +530,6 @@ public class DeleteDropTarget extends ButtonDropTarget { Runnable onAnimationEndRunnable = new Runnable() { @Override public void run() { - mSearchDropTargetBar.onDragEnd(); - // If we are dragging from AllApps, then we allow AppsCustomizePagedView to clean up // itself, otherwise, complete the drop to initiate the deletion process if (!isAllApps) { diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index 0a0861f47..e681aa12c 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -23,13 +23,10 @@ import android.content.Context; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.view.LayoutInflater; import android.view.View; import android.view.animation.AccelerateInterpolator; import android.widget.FrameLayout; -import com.android.launcher3.R; - /* * Ths bar will manage the transition between the QSB search bar and the delete drop * targets so that each of the individual IconDropTargets don't have to. |