summaryrefslogtreecommitdiff
path: root/libs/input/PointerController.cpp
diff options
context:
space:
mode:
authorJun Mukai <mukai@google.com>2015-10-07 16:58:09 +0900
committerJun Mukai <mukai@google.com>2015-10-21 13:03:01 -0700
commit5ec7420ecd0e94be0a07fc77b0bc950deb0178fd (patch)
tree71eff50268fe0f4e860458a43ed6b6cc87d2032d /libs/input/PointerController.cpp
parent3a36f0a3ab7af0fde7267c70c4866c145b23aeb3 (diff)
Use invisible icon for POINTER_ICON_STYLE_NULL.
Change-Id: I10d35bdc4da4817d769eb164e6f15e4618670a05
Diffstat (limited to 'libs/input/PointerController.cpp')
-rw-r--r--libs/input/PointerController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp
index 0f86bc614b2b..4a1d7e7b5c64 100644
--- a/libs/input/PointerController.cpp
+++ b/libs/input/PointerController.cpp
@@ -78,7 +78,7 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>&
mLocked.pointerAlpha = 0.0f; // pointer is initially faded
mLocked.pointerSprite = mSpriteController->createSprite();
mLocked.pointerIconChanged = false;
- mLocked.requestedPointerShape = 0;
+ mLocked.requestedPointerShape = mPolicy->getDefaultPointerIconId();
mLocked.buttonState = 0;
@@ -512,7 +512,7 @@ void PointerController::updatePointerLocked() {
if (mLocked.pointerIconChanged || mLocked.presentationChanged) {
if (mLocked.presentation == PRESENTATION_POINTER) {
- if (mLocked.requestedPointerShape == 0) {
+ if (mLocked.requestedPointerShape == mPolicy->getDefaultPointerIconId()) {
mLocked.pointerSprite->setIcon(mLocked.pointerIcon);
} else {
std::map<int, SpriteIcon>::const_iterator iter =