Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java

Issue 2308103002: Disable WebView/Chrome's drag and drop feature on M and below. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
/**
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('k') | ui/android/view_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698