fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -240,7 +240,10 @@ public abstract class ButtonDropTarget extends TextView
|
||||
|
||||
protected abstract boolean supportsDrop(ItemInfo info);
|
||||
|
||||
public abstract boolean supportsAccessibilityDrop(ItemInfo info, View view);
|
||||
/**
|
||||
* Returns the accessibility action that {@link ButtonDropTarget} supports for the itemInfo.
|
||||
*/
|
||||
public abstract int getSupportedAccessibilityAction(ItemInfo info, View view);
|
||||
|
||||
@Override
|
||||
public boolean isDropEnabled() {
|
||||
@@ -292,14 +295,16 @@ public abstract class ButtonDropTarget extends TextView
|
||||
@Override
|
||||
public void prepareAccessibilityDrop() { }
|
||||
|
||||
public abstract void onAccessibilityDrop(View view, ItemInfo item);
|
||||
/** Performs a drop in case of accessibility services with the provided action for the item. */
|
||||
public abstract void onAccessibilityDrop(View view, ItemInfo item, int action);
|
||||
|
||||
public abstract void completeDrop(DragObject d);
|
||||
|
||||
@Override
|
||||
public void getHitRectRelativeToDragLayer(android.graphics.Rect outRect) {
|
||||
super.getHitRect(outRect);
|
||||
outRect.bottom += mActivityContext.getDeviceProfile().dropTargetDragPaddingPx;
|
||||
outRect.bottom +=
|
||||
mActivityContext.getDeviceProfile().getDropTargetProfile().getDragPaddingPx();
|
||||
|
||||
sTempCords[0] = sTempCords[1] = 0;
|
||||
mActivityContext.getDragLayer().getDescendantCoordRelativeToSelf(this, sTempCords);
|
||||
|
||||
Reference in new issue
Block a user