diff options
author | Arthur Hung <arthurhung@google.com> | 2019-02-26 16:35:01 +0800 |
---|---|---|
committer | Arthur Hung <arthurhung@google.com> | 2019-02-26 16:43:53 +0800 |
commit | 350896b59614e9c3d488c37a50ddc51ed9f62f25 (patch) | |
tree | 4d56d9e7d47cc2ef635b14195c76db6d3110fc0f /libs/input/PointerController.cpp | |
parent | 6a5cd884a2b905256244dd6dd180146846cf14bc (diff) |
Fix mouse pointer not getting enlarged
When show taps enabled, the presentation would be
PRESENTATION_SPOT for drawing the spots. That would
ignore loadPointerIcon when reload resources.
Always load default icon when reload resources.
Bug: 115395392
Test: Enable show taps and use mouse,
enabled large mouse pointer manually.
Change-Id: I74f2bf33c9046e8eaba7d284ca16366da6e3d221
Diffstat (limited to 'libs/input/PointerController.cpp')
-rw-r--r-- | libs/input/PointerController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index 733b866d9c4c..abf083789c23 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -759,11 +759,11 @@ void PointerController::fadeOutAndReleaseAllSpotsLocked() { void PointerController::loadResourcesLocked() REQUIRES(mLock) { mPolicy->loadPointerResources(&mResources, mLocked.viewport.displayId); + mPolicy->loadPointerIcon(&mLocked.pointerIcon, mLocked.viewport.displayId); + mLocked.additionalMouseResources.clear(); + mLocked.animationResources.clear(); if (mLocked.presentation == PRESENTATION_POINTER) { - mLocked.additionalMouseResources.clear(); - mLocked.animationResources.clear(); - mPolicy->loadPointerIcon(&mLocked.pointerIcon, mLocked.viewport.displayId); mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources, &mLocked.animationResources, mLocked.viewport.displayId); } |