commit e051f6f1fdb5e21cbed394d29dfcab5c642e4129
author Michael Wright <michaelwr@google.com> Fri May 13 17:44:16 2016 +0100
committer Michael Wright <michaelwr@google.com> Sat Jun 04 02:20:21 2016 +0100
tree e2123dbc463184c51e72e416a1363e14e1f9f233
parent f5e5c3a72ac8d8ebd5cfbbdceb533a125190b610

Rename PointerIcon and Pointer Capture APIs

This is a response to API council feedback.

Bug: 26830970
Change-Id: I1be541a53e3943d06640169671824f7daea15462

services/core/jni/com_android_server_input_InputManagerService.cpp

diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 197c043..e8237ef 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -204,7 +204,7 @@
     void setShowTouches(bool enabled);
     void setInteractive(bool interactive);
     void reloadCalibration();
-    void setPointerIconShape(int32_t iconId);
+    void setPointerIconType(int32_t iconId);
     void reloadPointerIcons();
     void setCustomPointerIcon(const SpriteIcon& icon);
     void setPointerIconDetached(bool detached);
@@ -785,11 +785,11 @@
             InputReaderConfiguration::CHANGE_TOUCH_AFFINE_TRANSFORMATION);
 }
 
-void NativeInputManager::setPointerIconShape(int32_t iconId) {
+void NativeInputManager::setPointerIconType(int32_t iconId) {
     AutoMutex _l(mLock);
     sp<PointerController> controller = mLocked.pointerController.promote();
     if (controller != NULL) {
-        controller->updatePointerShape(iconId);
+        controller->updatePointerIcon(iconId);
     }
 }
 
@@ -1462,9 +1462,9 @@
     im->getInputManager()->getDispatcher()->monitor();
 }
 
-static void nativeSetPointerIconShape(JNIEnv* /* env */, jclass /* clazz */, jlong ptr, jint iconId) {
+static void nativeSetPointerIconType(JNIEnv* /* env */, jclass /* clazz */, jlong ptr, jint iconId) {
     NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
-    im->setPointerIconShape(iconId);
+    im->setPointerIconType(iconId);
 }
 
 static void nativeReloadPointerIcons(JNIEnv* /* env */, jclass /* clazz */, jlong ptr) {
@@ -1548,8 +1548,8 @@
             (void*) nativeDump },
     { "nativeMonitor", "(J)V",
             (void*) nativeMonitor },
-    { "nativeSetPointerIconShape", "(JI)V",
-            (void*) nativeSetPointerIconShape },
+    { "nativeSetPointerIconType", "(JI)V",
+            (void*) nativeSetPointerIconType },
     { "nativeReloadPointerIcons", "(J)V",
             (void*) nativeReloadPointerIcons },
     { "nativeSetCustomPointerIcon", "(JLandroid/view/PointerIcon;)V",