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

libs/input/PointerController.cpp

diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 212c6a0..ad9e2d7 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -84,7 +84,7 @@
     mLocked.pointerAlpha = 0.0f; // pointer is initially faded
     mLocked.pointerSprite = mSpriteController->createSprite();
     mLocked.pointerIconChanged = false;
-    mLocked.requestedPointerShape = mPolicy->getDefaultPointerIconId();
+    mLocked.requestedPointerType = mPolicy->getDefaultPointerIconId();
 
     mLocked.animationFrameIndex = 0;
     mLocked.lastFrameUpdatedTime = 0;
@@ -459,10 +459,10 @@
     updatePointerLocked();
 }
 
-void PointerController::updatePointerShape(int32_t iconId) {
+void PointerController::updatePointerIcon(int32_t iconId) {
     AutoMutex _l(mLock);
-    if (mLocked.requestedPointerShape != iconId) {
-        mLocked.requestedPointerShape = iconId;
+    if (mLocked.requestedPointerType != iconId) {
+        mLocked.requestedPointerType = iconId;
         mLocked.presentationChanged = true;
         updatePointerLocked();
     }
@@ -473,7 +473,7 @@
 
     const int32_t iconId = mPolicy->getCustomPointerIconId();
     mLocked.additionalMouseResources[iconId] = icon;
-    mLocked.requestedPointerShape = iconId;
+    mLocked.requestedPointerType = iconId;
     mLocked.presentationChanged = true;
 
     updatePointerLocked();
@@ -574,7 +574,7 @@
 
 bool PointerController::doBitmapAnimationLocked(nsecs_t timestamp) {
     std::map<int32_t, PointerAnimation>::const_iterator iter = mLocked.animationResources.find(
-            mLocked.requestedPointerShape);
+            mLocked.requestedPointerType);
     if (iter == mLocked.animationResources.end()) {
         return false;
     }
@@ -636,14 +636,14 @@
 
     if (mLocked.pointerIconChanged || mLocked.presentationChanged) {
         if (mLocked.presentation == PRESENTATION_POINTER) {
-            if (mLocked.requestedPointerShape == mPolicy->getDefaultPointerIconId()) {
+            if (mLocked.requestedPointerType == mPolicy->getDefaultPointerIconId()) {
                 mLocked.pointerSprite->setIcon(mLocked.pointerIcon);
             } else {
                 std::map<int32_t, SpriteIcon>::const_iterator iter =
-                    mLocked.additionalMouseResources.find(mLocked.requestedPointerShape);
+                    mLocked.additionalMouseResources.find(mLocked.requestedPointerType);
                 if (iter != mLocked.additionalMouseResources.end()) {
                     std::map<int32_t, PointerAnimation>::const_iterator anim_iter =
-                            mLocked.animationResources.find(mLocked.requestedPointerShape);
+                            mLocked.animationResources.find(mLocked.requestedPointerType);
                     if (anim_iter != mLocked.animationResources.end()) {
                         mLocked.animationFrameIndex = 0;
                         mLocked.lastFrameUpdatedTime = systemTime(SYSTEM_TIME_MONOTONIC);
@@ -651,7 +651,7 @@
                     }
                     mLocked.pointerSprite->setIcon(iter->second);
                 } else {
-                    ALOGW("Can't find the resource for icon id %d", mLocked.requestedPointerShape);
+                    ALOGW("Can't find the resource for icon id %d", mLocked.requestedPointerType);
                     mLocked.pointerSprite->setIcon(mLocked.pointerIcon);
                 }
             }