Change POINTER_ICON_STYLE enum to a type safe enum class
Test: Current tests all pass, this is a static type change, not
a functional change.
Change-Id: I1ee4861c025bfdc301cb73adec700133548b29a5
diff --git a/include/input/Input.h b/include/input/Input.h
index 693f68a..e0c9de4 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -1061,35 +1061,44 @@
/* Pointer icon styles.
* Must match the definition in android.view.PointerIcon.
+ *
+ * Due to backwards compatibility and public api constraints, this is a duplicate (but type safe)
+ * definition of PointerIcon.java.
+ *
+ * TODO(b/235023317) move this definition to an aidl and statically assign to the below java public
+ * api values.
+ *
+ * WARNING: Keep these definitions in sync with
+ * frameworks/base/core/java/android/view/PointerIcon.java
*/
-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,
+enum class PointerIconStyle : int32_t {
+ TYPE_CUSTOM = -1,
+ TYPE_NULL = 0,
+ TYPE_ARROW = 1000,
+ TYPE_CONTEXT_MENU = 1001,
+ TYPE_HAND = 1002,
+ TYPE_HELP = 1003,
+ TYPE_WAIT = 1004,
+ TYPE_CELL = 1006,
+ TYPE_CROSSHAIR = 1007,
+ TYPE_TEXT = 1008,
+ TYPE_VERTICAL_TEXT = 1009,
+ TYPE_ALIAS = 1010,
+ TYPE_COPY = 1011,
+ TYPE_NO_DROP = 1012,
+ TYPE_ALL_SCROLL = 1013,
+ TYPE_HORIZONTAL_DOUBLE_ARROW = 1014,
+ TYPE_VERTICAL_DOUBLE_ARROW = 1015,
+ TYPE_TOP_RIGHT_DOUBLE_ARROW = 1016,
+ TYPE_TOP_LEFT_DOUBLE_ARROW = 1017,
+ TYPE_ZOOM_IN = 1018,
+ TYPE_ZOOM_OUT = 1019,
+ TYPE_GRAB = 1020,
+ TYPE_GRABBING = 1021,
- POINTER_ICON_STYLE_SPOT_HOVER = 2000,
- POINTER_ICON_STYLE_SPOT_TOUCH = 2001,
- POINTER_ICON_STYLE_SPOT_ANCHOR = 2002,
+ TYPE_SPOT_HOVER = 2000,
+ TYPE_SPOT_TOUCH = 2001,
+ TYPE_SPOT_ANCHOR = 2002,
};
} // namespace android