Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c05d313e authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Solve fling-to-delete bug" into jb-ub-now-indigo-rose

parents 5e7af5d7 b605102c

src/com/android/launcher3/DeleteDropTarget.java

+0 −2
Original line number Diff line number Diff line
@@ -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) {

src/com/android/launcher3/SearchDropTargetBar.java

+0 −3
Original line number Diff line number Diff line
@@ -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.