Merge "Consolidate the CursorShape constants in wayland_cursor.h" (794381b8) · Commits · e / os / android_frameworks_base

core/jni/android_view_PointerIcon.cpp

+3 −4

Original line number	Diff line number	Diff line
		@@ -16,15 +16,14 @@

		#define LOG_TAG "PointerIcon-JNI"

		#include <nativehelper/JNIHelp.h>

		#include "android_view_PointerIcon.h"

		#include <android/graphics/bitmap.h>
		#include <android_runtime/AndroidRuntime.h>
		#include <android_runtime/Log.h>
		#include <utils/Log.h>
		#include <android/graphics/bitmap.h>
		#include <nativehelper/JNIHelp.h>
		#include <nativehelper/ScopedLocalRef.h>
		#include <utils/Log.h>

		#include "core_jni_helpers.h"

core/jni/android_view_PointerIcon.h

+13 −50

Original line number	Diff line number	Diff line
		@@ -17,55 +17,21 @@
		#ifndef _ANDROID_VIEW_POINTER_ICON_H
		#define _ANDROID_VIEW_POINTER_ICON_H

		#include "jni.h"

		#include <vector>

		#include <android/graphics/bitmap.h>
		#include <input/Input.h>
		#include <utils/Errors.h>

		namespace android {
		#include <vector>

		/* Pointer icon styles.
		* Must match the definition in android.view.PointerIcon.
		*/
		enum {
		POINTER_ICON_STYLE_CUSTOM = -1,
		POINTER_ICON_STYLE_NULL = 0,
		POINTER_ICON_STYLE_ARROW = 1000,
		POINTER_ICON_STYLE_CONTEXT_MENU = 1001,
		POINTER_ICON_STYLE_HAND = 1002,
		POINTER_ICON_STYLE_HELP = 1003,
		POINTER_ICON_STYLE_WAIT = 1004,
		POINTER_ICON_STYLE_CELL = 1006,
		POINTER_ICON_STYLE_CROSSHAIR = 1007,
		POINTER_ICON_STYLE_TEXT = 1008,
		POINTER_ICON_STYLE_VERTICAL_TEXT = 1009,
		POINTER_ICON_STYLE_ALIAS = 1010,
		POINTER_ICON_STYLE_COPY = 1011,
		POINTER_ICON_STYLE_NO_DROP = 1012,
		POINTER_ICON_STYLE_ALL_SCROLL = 1013,
		POINTER_ICON_STYLE_HORIZONTAL_DOUBLE_ARROW = 1014,
		POINTER_ICON_STYLE_VERTICAL_DOUBLE_ARROW = 1015,
		POINTER_ICON_STYLE_TOP_RIGHT_DOUBLE_ARROW = 1016,
		POINTER_ICON_STYLE_TOP_LEFT_DOUBLE_ARROW = 1017,
		POINTER_ICON_STYLE_ZOOM_IN = 1018,
		POINTER_ICON_STYLE_ZOOM_OUT = 1019,
		POINTER_ICON_STYLE_GRAB = 1020,
		POINTER_ICON_STYLE_GRABBING = 1021,
		#include "jni.h"

		POINTER_ICON_STYLE_SPOT_HOVER = 2000,
		POINTER_ICON_STYLE_SPOT_TOUCH = 2001,
		POINTER_ICON_STYLE_SPOT_ANCHOR = 2002,
		};
		namespace android {

		/*
		* Describes a pointer icon.
		*/
		struct PointerIcon {
		inline PointerIcon() {
		reset();
		}
		inline PointerIcon() { reset(); }

		int32_t style;
		graphics::Bitmap bitmap;
		@@ -74,9 +40,7 @@ struct PointerIcon {
		std::vector<graphics::Bitmap> bitmapFrames;
		int32_t durationPerFrame;

		inline bool isNullIcon() {
		return style == POINTER_ICON_STYLE_NULL;
		}
		inline bool isNullIcon() { return style == POINTER_ICON_STYLE_NULL; }

		inline void reset() {
		style = POINTER_ICON_STYLE_NULL;
		@@ -89,23 +53,22 @@ struct PointerIcon {
		};

		/* Gets a system pointer icon with the specified style. */
		extern jobject android_view_PointerIcon_getSystemIcon(JNIEnv* env,
		jobject contextObj, int32_t style);
		extern jobject android_view_PointerIcon_getSystemIcon(JNIEnv* env, jobject contextObj,
		int32_t style);

		/* Loads the bitmap associated with a pointer icon.
		* If pointerIconObj is NULL, returns OK and a pointer icon with POINTER_ICON_STYLE_NULL. */
		extern status_t android_view_PointerIcon_load(JNIEnv* env,
		jobject pointerIconObj, jobject contextObj, PointerIcon* outPointerIcon);
		extern status_t android_view_PointerIcon_load(JNIEnv* env, jobject pointerIconObj,
		jobject contextObj, PointerIcon* outPointerIcon);

		/* Obtain the data of pointerIconObj and put to outPointerIcon. */
		extern status_t android_view_PointerIcon_getLoadedIcon(JNIEnv* env, jobject pointerIconObj,
		PointerIcon* outPointerIcon);


		/* Loads the bitmap associated with a pointer icon by style.
		* If pointerIconObj is NULL, returns OK and a pointer icon with POINTER_ICON_STYLE_NULL. */
		extern status_t android_view_PointerIcon_loadSystemIcon(JNIEnv* env,
		jobject contextObj, int32_t style, PointerIcon* outPointerIcon);
		extern status_t android_view_PointerIcon_loadSystemIcon(JNIEnv* env, jobject contextObj,
		int32_t style, PointerIcon* outPointerIcon);

		} // namespace android

services/core/jni/com_android_server_input_InputManagerService.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		#include <android_view_VerifiedMotionEvent.h>
		#include <batteryservice/include/batteryservice/BatteryServiceConstants.h>
		#include <binder/IServiceManager.h>
		#include <input/Input.h>
		#include <input/PointerController.h>
		#include <input/SpriteController.h>
		#include <inputflinger/InputManager.h>