diff options
| author | Michael Wright <michaelwr@google.com> | 2016-05-13 17:44:16 +0100 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2016-05-17 18:02:32 +0100 |
| commit | f9d9ce7705475874c82af04eb9b208a7fb556792 (patch) | |
| tree | a8f7403f319741c752426d917b043ce0f554b614 /libs/input/PointerController.h | |
| parent | cef3337cb5e27d4f571fb350be055c26d339833d (diff) | |
DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
This is a response to API council feedback.
Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
Diffstat (limited to 'libs/input/PointerController.h')
| -rw-r--r-- | libs/input/PointerController.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h index c1381f32a37f..b47139adaf90 100644 --- a/libs/input/PointerController.h +++ b/libs/input/PointerController.h @@ -105,7 +105,7 @@ public: 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 @@ private: std::map<int32_t, SpriteIcon> additionalMouseResources; std::map<int32_t, PointerAnimation> animationResources; - int32_t requestedPointerShape; + int32_t requestedPointerType; int32_t buttonState; |