From 350896b59614e9c3d488c37a50ddc51ed9f62f25 Mon Sep 17 00:00:00 2001 From: Arthur Hung Date: Tue, 26 Feb 2019 16:35:01 +0800 Subject: 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 --- libs/input/PointerController.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/input/PointerController.cpp') 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); } -- cgit v1.2.3-59-g8ed1b