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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2878403002: Support setting mouse cursor icon in Android N. (Closed)
Patch Set: Support setting mouse cursor icon in Android N Created 3 years, 7 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
« content/public/android/javatests/src/org/chromium/content/browser/ContentViewPointerIconTest.java ('K') | « ui/android/DEPS ('k') | ui/android/view_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d99f612d6b2770436574b97a96f73aef32a66a33..b9e188badafea5c60b4d2a11a34efa33e6d29a8a 100644
--- a/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
@@ -8,6 +8,7 @@ import android.annotation.TargetApi;
import android.content.ClipData;
import android.graphics.Bitmap;
import android.os.Build;
+import android.view.PointerIcon;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout.LayoutParams;
@@ -16,6 +17,7 @@ import android.widget.ImageView;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
+import org.chromium.blink_public.web.WebCursorInfoType;
/**
* Class to acquire, position, and remove anchor views from the implementing View.
@@ -99,6 +101,150 @@ public abstract class ViewAndroidDelegate {
new View.DragShadowBuilder(imageView), null, View.DRAG_FLAG_GLOBAL);
}
+ @CalledByNative
+ private void onCursorChangedToCustom(Bitmap customCursorBitmap, int hotspotX, int hotspotY) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ PointerIcon icon = PointerIcon.create(customCursorBitmap, hotspotX, hotspotY);
+ updatePointerIcon(icon);
+ }
+ }
+
+ @CalledByNative
+ private void onCursorChanged(int cursorType) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return;
+
+ int pointerIconType = PointerIcon.TYPE_ARROW;
+ switch (cursorType) {
+ case WebCursorInfoType.TYPE_NONE:
+ pointerIconType = PointerIcon.TYPE_NULL;
+ break;
+ case WebCursorInfoType.TYPE_POINTER:
+ pointerIconType = PointerIcon.TYPE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_CONTEXT_MENU:
+ pointerIconType = PointerIcon.TYPE_CONTEXT_MENU;
+ break;
+ case WebCursorInfoType.TYPE_HAND:
+ pointerIconType = PointerIcon.TYPE_HAND;
+ break;
+ case WebCursorInfoType.TYPE_HELP:
+ pointerIconType = PointerIcon.TYPE_HELP;
+ break;
+ case WebCursorInfoType.TYPE_WAIT:
+ pointerIconType = PointerIcon.TYPE_WAIT;
+ break;
+ case WebCursorInfoType.TYPE_CELL:
+ pointerIconType = PointerIcon.TYPE_CELL;
+ break;
+ case WebCursorInfoType.TYPE_CROSS:
+ pointerIconType = PointerIcon.TYPE_CROSSHAIR;
+ break;
+ case WebCursorInfoType.TYPE_I_BEAM:
+ pointerIconType = PointerIcon.TYPE_TEXT;
+ break;
+ case WebCursorInfoType.TYPE_VERTICAL_TEXT:
+ pointerIconType = PointerIcon.TYPE_VERTICAL_TEXT;
+ break;
+ case WebCursorInfoType.TYPE_ALIAS:
+ pointerIconType = PointerIcon.TYPE_ALIAS;
+ break;
+ case WebCursorInfoType.TYPE_COPY:
+ pointerIconType = PointerIcon.TYPE_COPY;
+ break;
+ case WebCursorInfoType.TYPE_NO_DROP:
+ pointerIconType = PointerIcon.TYPE_NO_DROP;
+ break;
+ case WebCursorInfoType.TYPE_COLUMN_RESIZE:
+ pointerIconType = PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_ROW_RESIZE:
+ pointerIconType = PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_NORTH_EAST_SOUTH_WEST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_NORTH_WEST_SOUTH_EAST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_ZOOM_IN:
+ pointerIconType = PointerIcon.TYPE_ZOOM_IN;
+ break;
+ case WebCursorInfoType.TYPE_ZOOM_OUT:
+ pointerIconType = PointerIcon.TYPE_ZOOM_OUT;
+ break;
+ case WebCursorInfoType.TYPE_GRAB:
+ pointerIconType = PointerIcon.TYPE_GRAB;
+ break;
+ case WebCursorInfoType.TYPE_GRABBING:
+ pointerIconType = PointerIcon.TYPE_GRABBING;
+ break;
+ // TODO(jaebaek): set types correctly
+ // after fixing http://crbug.com/584424.
+ case WebCursorInfoType.TYPE_EAST_WEST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_NORTH_SOUTH_RESIZE:
+ pointerIconType = PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_EAST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_NORTH_RESIZE:
+ pointerIconType = PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_NORTH_EAST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_NORTH_WEST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_SOUTH_RESIZE:
+ pointerIconType = PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_SOUTH_EAST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_SOUTH_WEST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_WEST_RESIZE:
+ pointerIconType = PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW;
+ break;
+ case WebCursorInfoType.TYPE_PROGRESS:
+ pointerIconType = PointerIcon.TYPE_WAIT;
+ break;
+ case WebCursorInfoType.TYPE_NOT_ALLOWED:
+ pointerIconType = PointerIcon.TYPE_NO_DROP;
+ break;
+ case WebCursorInfoType.TYPE_MOVE:
+ case WebCursorInfoType.TYPE_MIDDLE_PANNING:
+ pointerIconType = PointerIcon.TYPE_ALL_SCROLL;
+ break;
+ case WebCursorInfoType.TYPE_EAST_PANNING:
+ case WebCursorInfoType.TYPE_NORTH_PANNING:
+ case WebCursorInfoType.TYPE_NORTH_EAST_PANNING:
+ case WebCursorInfoType.TYPE_NORTH_WEST_PANNING:
+ case WebCursorInfoType.TYPE_SOUTH_PANNING:
+ case WebCursorInfoType.TYPE_SOUTH_EAST_PANNING:
+ case WebCursorInfoType.TYPE_SOUTH_WEST_PANNING:
+ case WebCursorInfoType.TYPE_WEST_PANNING:
+ assert false : "These pointer icon types are not supported";
+ break;
+ case WebCursorInfoType.TYPE_CUSTOM:
+ assert false : "onCursorChangedToCustom must be called instead";
+ break;
+ }
+ ViewGroup containerView = getContainerView();
+ PointerIcon icon = PointerIcon.getSystemIcon(containerView.getContext(), pointerIconType);
+ updatePointerIcon(icon);
+ }
+
+ /**
+ * Set mouse cursor type for Android N or upper version of Android.
+ * @param icon The type of mouse cursor to be updated.
+ */
+ public void updatePointerIcon(PointerIcon icon) {}
aelias_OOO_until_Jul13 2017/05/30 23:26:35 Please use "abstract" instead of default implement
jaebaek 2017/05/31 13:29:08 Done.
+
/**
* Called whenever the background color of the page changes as notified by Blink.
* @param color The new ARGB color of the page background.
« content/public/android/javatests/src/org/chromium/content/browser/ContentViewPointerIconTest.java ('K') | « ui/android/DEPS ('k') | ui/android/view_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698