Index: ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java |
diff --git a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java |
index cf0298ccabe0d8084d1bd0e574c8938e1c527f4e..aca3a8fe2db019187d19ff5c6ef0123c1ca2c0ae 100644 |
--- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java |
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java |
@@ -6,6 +6,7 @@ package org.chromium.ui.base; |
import android.content.ClipData; |
import android.graphics.Bitmap; |
+import android.os.Build; |
import android.view.View; |
import android.view.ViewGroup; |
import android.widget.FrameLayout.LayoutParams; |
@@ -85,20 +86,22 @@ public abstract class ViewAndroidDelegate { |
* @param shadowImage The shadow image for the dragged text. |
*/ |
@SuppressWarnings("deprecation") |
+ // TODO(hush): uncomment below when we build with API 24. |
+ // @TargetApi(Build.VERSION_CODES.N) |
@CalledByNative |
- private void startDragAndDrop(String text, Bitmap shadowImage) { |
- ClipData data = ClipData.newPlainText(null, text); |
+ private boolean startDragAndDrop(String text, Bitmap shadowImage) { |
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) return false; |
ViewGroup containerView = getContainerView(); |
- if (containerView == null) return; |
+ if (containerView == null) return false; |
ImageView imageView = new ImageView(containerView.getContext()); |
imageView.setImageBitmap(shadowImage); |
imageView.layout(0, 0, shadowImage.getWidth(), shadowImage.getHeight()); |
// TODO(hush): use View#startDragAndDrop when Chromium starts to build with API 24. |
- containerView.startDrag( |
- data, new View.DragShadowBuilder(imageView), null, DRAG_FLAG_GLOBAL); |
+ return containerView.startDrag(ClipData.newPlainText(null, text), |
+ new View.DragShadowBuilder(imageView), null, DRAG_FLAG_GLOBAL); |
} |
/** |