Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move PointerController enums to enum classes.

Browse Source 
Bug: 160010896
Test: atest PointerController_test, compile
Change-Id: I6c7bfc91023ce6cd2dc8f82b0d72731f871ad3ea
Merged-In: I6c7bfc91023ce6cd2dc8f82b0d72731f871ad3ea
(cherry picked from commit 676897dc11)
This commit is contained in:
Michael Wright
2020-07-02 00:01:38 +01:00
committed by Garfield Tan
parent 78ec762f0c
commit 12956dc51d
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/input/PointerController.cpp
View File

@@ -83,10 +83,10 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>&
mLocked.animationPending = false; mLocked.animationPending = false;
mLocked.presentation = PRESENTATION_POINTER; mLocked.presentation = Presentation::POINTER;
mLocked.presentationChanged = false; mLocked.presentationChanged = false;
mLocked.inactivityTimeout = INACTIVITY_TIMEOUT_NORMAL; mLocked.inactivityTimeout = InactivityTimeout::NORMAL;
mLocked.pointerFadeDirection = 0; mLocked.pointerFadeDirection = 0;
mLocked.pointerX = 0; mLocked.pointerX = 0;
@@ -221,7 +221,7 @@ void PointerController::fade(Transition transition) {
removeInactivityTimeoutLocked(); removeInactivityTimeoutLocked();
// Start fading. // Start fading.
if (transition == TRANSITION_IMMEDIATE) { if (transition == Transition::IMMEDIATE) {
mLocked.pointerFadeDirection = 0; mLocked.pointerFadeDirection = 0;
mLocked.pointerAlpha = 0.0f; mLocked.pointerAlpha = 0.0f;
updatePointerLocked(); updatePointerLocked();
@@ -238,7 +238,7 @@ void PointerController::unfade(Transition transition) {
resetInactivityTimeoutLocked(); resetInactivityTimeoutLocked();
// Start unfading. // Start unfading.
if (transition == TRANSITION_IMMEDIATE) { if (transition == Transition::IMMEDIATE) {
mLocked.pointerFadeDirection = 0; mLocked.pointerFadeDirection = 0;
mLocked.pointerAlpha = 1.0f; mLocked.pointerAlpha = 1.0f;
updatePointerLocked(); updatePointerLocked();
@@ -262,7 +262,7 @@ void PointerController::setPresentation(Presentation presentation) {
return; return;
} }
if (presentation == PRESENTATION_POINTER) { if (presentation == Presentation::POINTER) {
if (mLocked.additionalMouseResources.empty()) { if (mLocked.additionalMouseResources.empty()) {
mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources, mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,
&mLocked.animationResources, &mLocked.animationResources,
@@ -624,7 +624,7 @@ bool PointerController::doBitmapAnimationLocked(nsecs_t timestamp) {
} }
void PointerController::doInactivityTimeout() { void PointerController::doInactivityTimeout() {
fade(TRANSITION_GRADUAL); fade(Transition::GRADUAL);
} }
void PointerController::startAnimationLocked() { void PointerController::startAnimationLocked() {
@@ -638,8 +638,9 @@ void PointerController::startAnimationLocked() {
void PointerController::resetInactivityTimeoutLocked() { void PointerController::resetInactivityTimeoutLocked() {
mLooper->removeMessages(mHandler, MSG_INACTIVITY_TIMEOUT); mLooper->removeMessages(mHandler, MSG_INACTIVITY_TIMEOUT);
nsecs_t timeout = mLocked.inactivityTimeout == INACTIVITY_TIMEOUT_SHORT nsecs_t timeout = mLocked.inactivityTimeout == InactivityTimeout::SHORT
? INACTIVITY_TIMEOUT_DELAY_TIME_SHORT : INACTIVITY_TIMEOUT_DELAY_TIME_NORMAL; ? INACTIVITY_TIMEOUT_DELAY_TIME_SHORT
: INACTIVITY_TIMEOUT_DELAY_TIME_NORMAL;
mLooper->sendMessageDelayed(timeout, mHandler, MSG_INACTIVITY_TIMEOUT); mLooper->sendMessageDelayed(timeout, mHandler, MSG_INACTIVITY_TIMEOUT);
} }
@@ -666,7 +667,7 @@ void PointerController::updatePointerLocked() REQUIRES(mLock) {
} }
if (mLocked.pointerIconChanged || mLocked.presentationChanged) { if (mLocked.pointerIconChanged || mLocked.presentationChanged) {
if (mLocked.presentation == PRESENTATION_POINTER) { if (mLocked.presentation == Presentation::POINTER) {
if (mLocked.requestedPointerType == mPolicy->getDefaultPointerIconId()) { if (mLocked.requestedPointerType == mPolicy->getDefaultPointerIconId()) {
mLocked.pointerSprite->setIcon(mLocked.pointerIcon); mLocked.pointerSprite->setIcon(mLocked.pointerIcon);
} else { } else {
@@ -783,7 +784,7 @@ void PointerController::loadResourcesLocked() REQUIRES(mLock) {
mLocked.additionalMouseResources.clear(); mLocked.additionalMouseResources.clear();
mLocked.animationResources.clear(); mLocked.animationResources.clear();
if (mLocked.presentation == PRESENTATION_POINTER) { if (mLocked.presentation == Presentation::POINTER) {
mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources, mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,
&mLocked.animationResources, mLocked.viewport.displayId); &mLocked.animationResources, mLocked.viewport.displayId);
} }

6
libs/input/PointerController.h
View File

@@ -81,9 +81,9 @@ public:
static std::shared_ptr<PointerController> create( static std::shared_ptr<PointerController> create(
const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper, const sp<PointerControllerPolicyInterface>& policy, const sp<Looper>& looper,
const sp<SpriteController>& spriteController); const sp<SpriteController>& spriteController);
enum InactivityTimeout { enum class InactivityTimeout {
INACTIVITY_TIMEOUT_NORMAL = 0, NORMAL = 0,
INACTIVITY_TIMEOUT_SHORT = 1, SHORT = 1,
}; };
virtual ~PointerController(); virtual ~PointerController();

12
libs/input/tests/PointerController_test.cpp
View File

@@ -193,7 +193,7 @@ void PointerControllerTest::loopThread() {
TEST_F(PointerControllerTest, useDefaultCursorTypeByDefault) { TEST_F(PointerControllerTest, useDefaultCursorTypeByDefault) {
ensureDisplayViewportIsSet(); ensureDisplayViewportIsSet();
mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE); mPointerController->unfade(PointerController::Transition::IMMEDIATE);
std::pair<float, float> hotspot = getHotSpotCoordinatesForType(CURSOR_TYPE_DEFAULT); std::pair<float, float> hotspot = getHotSpotCoordinatesForType(CURSOR_TYPE_DEFAULT);
EXPECT_CALL(*mPointerSprite, setVisible(true)); EXPECT_CALL(*mPointerSprite, setVisible(true));
@@ -208,7 +208,7 @@ TEST_F(PointerControllerTest, useDefaultCursorTypeByDefault) {
TEST_F(PointerControllerTest, updatePointerIcon) { TEST_F(PointerControllerTest, updatePointerIcon) {
ensureDisplayViewportIsSet(); ensureDisplayViewportIsSet();
mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE); mPointerController->unfade(PointerController::Transition::IMMEDIATE);
int32_t type = CURSOR_TYPE_ADDITIONAL; int32_t type = CURSOR_TYPE_ADDITIONAL;
std::pair<float, float> hotspot = getHotSpotCoordinatesForType(type); std::pair<float, float> hotspot = getHotSpotCoordinatesForType(type);
@@ -224,7 +224,7 @@ TEST_F(PointerControllerTest, updatePointerIcon) {
TEST_F(PointerControllerTest, setCustomPointerIcon) { TEST_F(PointerControllerTest, setCustomPointerIcon) {
ensureDisplayViewportIsSet(); ensureDisplayViewportIsSet();
mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE); mPointerController->unfade(PointerController::Transition::IMMEDIATE);
int32_t style = CURSOR_TYPE_CUSTOM; int32_t style = CURSOR_TYPE_CUSTOM;
float hotSpotX = 15; float hotSpotX = 15;
@@ -246,13 +246,13 @@ TEST_F(PointerControllerTest, setCustomPointerIcon) {
} }
TEST_F(PointerControllerTest, doesNotGetResourcesBeforeSettingViewport) { TEST_F(PointerControllerTest, doesNotGetResourcesBeforeSettingViewport) {
mPointerController->setPresentation(PointerController::PRESENTATION_POINTER); mPointerController->setPresentation(PointerController::Presentation::POINTER);
mPointerController->setSpots(nullptr, nullptr, BitSet32(), -1); mPointerController->setSpots(nullptr, nullptr, BitSet32(), -1);
mPointerController->clearSpots(); mPointerController->clearSpots();
mPointerController->setPosition(1.0f, 1.0f); mPointerController->setPosition(1.0f, 1.0f);
mPointerController->move(1.0f, 1.0f); mPointerController->move(1.0f, 1.0f);
mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE); mPointerController->unfade(PointerController::Transition::IMMEDIATE);
mPointerController->fade(PointerController::TRANSITION_IMMEDIATE); mPointerController->fade(PointerController::Transition::IMMEDIATE);
EXPECT_TRUE(mPolicy->noResourcesAreLoaded()); EXPECT_TRUE(mPolicy->noResourcesAreLoaded());

5
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -810,9 +810,8 @@ void NativeInputManager::updateInactivityTimeoutLocked() REQUIRES(mLock) {
} }
bool lightsOut = mLocked.systemUiVisibility & ASYSTEM_UI_VISIBILITY_STATUS_BAR_HIDDEN; bool lightsOut = mLocked.systemUiVisibility & ASYSTEM_UI_VISIBILITY_STATUS_BAR_HIDDEN;
controller->setInactivityTimeout(lightsOut controller->setInactivityTimeout(lightsOut ? PointerController::InactivityTimeout::SHORT
? PointerController::INACTIVITY_TIMEOUT_SHORT : PointerController::InactivityTimeout::NORMAL);
: PointerController::INACTIVITY_TIMEOUT_NORMAL);
} }
void NativeInputManager::setPointerSpeed(int32_t speed) { void NativeInputManager::setPointerSpeed(int32_t speed) {