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.h

diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h
index c1381f3..b47139a 100644
--- a/libs/input/PointerController.h
+++ b/libs/input/PointerController.h
@@ -105,7 +105,7 @@
             const uint32_t* spotIdToIndex, BitSet32 spotIdBits);
     virtual void clearSpots();
 
-    void updatePointerShape(int32_t iconId);
+    void updatePointerIcon(int32_t iconId);
     void setCustomPointerIcon(const SpriteIcon& icon);
     void setDisplayViewport(int32_t width, int32_t height, int32_t orientation);
     void setInactivityTimeout(InactivityTimeout inactivityTimeout);
@@ -180,7 +180,7 @@
         std::map<int32_t, SpriteIcon> additionalMouseResources;
         std::map<int32_t, PointerAnimation> animationResources;
 
-        int32_t requestedPointerShape;
+        int32_t requestedPointerType;
 
         int32_t buttonState;