Merge "Move PointerController enums to enum classes." (bf640e1a) · Commits · e / os / android_frameworks_base

libs/input/PointerController.cpp

+11 −10

Original line number	Diff line number	Diff line
		@@ -83,10 +83,10 @@ PointerController::PointerController(const sp<PointerControllerPolicyInterface>&

		mLocked.animationPending = false;

		mLocked.presentation = PRESENTATION_POINTER;
		mLocked.presentation = Presentation::POINTER;
		mLocked.presentationChanged = false;

		mLocked.inactivityTimeout = INACTIVITY_TIMEOUT_NORMAL;
		mLocked.inactivityTimeout = InactivityTimeout::NORMAL;

		mLocked.pointerFadeDirection = 0;
		mLocked.pointerX = 0;
		@@ -221,7 +221,7 @@ void PointerController::fade(Transition transition) {
		removeInactivityTimeoutLocked();

		// Start fading.
		if (transition == TRANSITION_IMMEDIATE) {
		if (transition == Transition::IMMEDIATE) {
		mLocked.pointerFadeDirection = 0;
		mLocked.pointerAlpha = 0.0f;
		updatePointerLocked();
		@@ -238,7 +238,7 @@ void PointerController::unfade(Transition transition) {
		resetInactivityTimeoutLocked();

		// Start unfading.
		if (transition == TRANSITION_IMMEDIATE) {
		if (transition == Transition::IMMEDIATE) {
		mLocked.pointerFadeDirection = 0;
		mLocked.pointerAlpha = 1.0f;
		updatePointerLocked();
		@@ -262,7 +262,7 @@ void PointerController::setPresentation(Presentation presentation) {
		return;
		}

		if (presentation == PRESENTATION_POINTER) {
		if (presentation == Presentation::POINTER) {
		if (mLocked.additionalMouseResources.empty()) {
		mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,
		&mLocked.animationResources,
		@@ -624,7 +624,7 @@ bool PointerController::doBitmapAnimationLocked(nsecs_t timestamp) {
		}

		void PointerController::doInactivityTimeout() {
		fade(TRANSITION_GRADUAL);
		fade(Transition::GRADUAL);
		}

		void PointerController::startAnimationLocked() {
		@@ -638,8 +638,9 @@ void PointerController::startAnimationLocked() {
		void PointerController::resetInactivityTimeoutLocked() {
		mLooper->removeMessages(mHandler, MSG_INACTIVITY_TIMEOUT);

		nsecs_t timeout = mLocked.inactivityTimeout == INACTIVITY_TIMEOUT_SHORT
		? INACTIVITY_TIMEOUT_DELAY_TIME_SHORT : INACTIVITY_TIMEOUT_DELAY_TIME_NORMAL;
		nsecs_t timeout = mLocked.inactivityTimeout == InactivityTimeout::SHORT
		? INACTIVITY_TIMEOUT_DELAY_TIME_SHORT
		: INACTIVITY_TIMEOUT_DELAY_TIME_NORMAL;
		mLooper->sendMessageDelayed(timeout, mHandler, MSG_INACTIVITY_TIMEOUT);
		}

		@@ -666,7 +667,7 @@ void PointerController::updatePointerLocked() REQUIRES(mLock) {
		}

		if (mLocked.pointerIconChanged \|\| mLocked.presentationChanged) {
		if (mLocked.presentation == PRESENTATION_POINTER) {
		if (mLocked.presentation == Presentation::POINTER) {
		if (mLocked.requestedPointerType == mPolicy->getDefaultPointerIconId()) {
		mLocked.pointerSprite->setIcon(mLocked.pointerIcon);
		} else {
		@@ -783,7 +784,7 @@ void PointerController::loadResourcesLocked() REQUIRES(mLock) {

		mLocked.additionalMouseResources.clear();
		mLocked.animationResources.clear();
		if (mLocked.presentation == PRESENTATION_POINTER) {
		if (mLocked.presentation == Presentation::POINTER) {
		mPolicy->loadAdditionalMouseResources(&mLocked.additionalMouseResources,
		&mLocked.animationResources, mLocked.viewport.displayId);
		}

libs/input/PointerController.h

+3 −3

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

		virtual ~PointerController();

libs/input/tests/PointerController_test.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -193,7 +193,7 @@ void PointerControllerTest::loopThread() {

		TEST_F(PointerControllerTest, useDefaultCursorTypeByDefault) {
		ensureDisplayViewportIsSet();
		mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE);
		mPointerController->unfade(PointerController::Transition::IMMEDIATE);

		std::pair<float, float> hotspot = getHotSpotCoordinatesForType(CURSOR_TYPE_DEFAULT);
		EXPECT_CALL(*mPointerSprite, setVisible(true));
		@@ -208,7 +208,7 @@ TEST_F(PointerControllerTest, useDefaultCursorTypeByDefault) {

		TEST_F(PointerControllerTest, updatePointerIcon) {
		ensureDisplayViewportIsSet();
		mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE);
		mPointerController->unfade(PointerController::Transition::IMMEDIATE);

		int32_t type = CURSOR_TYPE_ADDITIONAL;
		std::pair<float, float> hotspot = getHotSpotCoordinatesForType(type);
		@@ -224,7 +224,7 @@ TEST_F(PointerControllerTest, updatePointerIcon) {

		TEST_F(PointerControllerTest, setCustomPointerIcon) {
		ensureDisplayViewportIsSet();
		mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE);
		mPointerController->unfade(PointerController::Transition::IMMEDIATE);

		int32_t style = CURSOR_TYPE_CUSTOM;
		float hotSpotX = 15;
		@@ -246,13 +246,13 @@ TEST_F(PointerControllerTest, setCustomPointerIcon) {
		}

		TEST_F(PointerControllerTest, doesNotGetResourcesBeforeSettingViewport) {
		mPointerController->setPresentation(PointerController::PRESENTATION_POINTER);
		mPointerController->setPresentation(PointerController::Presentation::POINTER);
		mPointerController->setSpots(nullptr, nullptr, BitSet32(), -1);
		mPointerController->clearSpots();
		mPointerController->setPosition(1.0f, 1.0f);
		mPointerController->move(1.0f, 1.0f);
		mPointerController->unfade(PointerController::TRANSITION_IMMEDIATE);
		mPointerController->fade(PointerController::TRANSITION_IMMEDIATE);
		mPointerController->unfade(PointerController::Transition::IMMEDIATE);
		mPointerController->fade(PointerController::Transition::IMMEDIATE);

		EXPECT_TRUE(mPolicy->noResourcesAreLoaded());

services/core/jni/com_android_server_input_InputManagerService.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -810,9 +810,8 @@ void NativeInputManager::updateInactivityTimeoutLocked() REQUIRES(mLock) {
		}

		bool lightsOut = mLocked.systemUiVisibility & ASYSTEM_UI_VISIBILITY_STATUS_BAR_HIDDEN;
		controller->setInactivityTimeout(lightsOut
		? PointerController::INACTIVITY_TIMEOUT_SHORT
		: PointerController::INACTIVITY_TIMEOUT_NORMAL);
		controller->setInactivityTimeout(lightsOut ? PointerController::InactivityTimeout::SHORT
		: PointerController::InactivityTimeout::NORMAL);
		}

		void NativeInputManager::setPointerSpeed(int32_t speed) {