resolved conflicts for e78e3d73 to ub-launcher3-master

Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6
This commit is contained in:
Sunny Goyal
2015-09-25 11:50:16 -07:00
14 changed files with 207 additions and 70 deletions

View File

@@ -21,6 +21,8 @@ import com.android.launcher3.dragndrop.DragView;
import android.graphics.PointF;
import android.graphics.Rect;
import com.android.launcher3.accessibility.DragViewStateAnnouncer;
/**
* Interface defining an object that can receive a drag.
*
@@ -66,6 +68,8 @@ public interface DropTarget {
/** Defers removing the DragView from the DragLayer until after the drop animation. */
public boolean deferDragViewCleanupPostAnimation = true;
public DragViewStateAnnouncer stateAnnouncer;
public DragObject() {
}