Merge "autoclick: Exit scroll mode when pausing autoclick" into main (d1a8f9db) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,9 @@ public class AutoclickController extends BaseEventStreamTransformation {
		public void toggleAutoclickPause(boolean paused) {
		if (paused) {
		cancelPendingClick();
		if (mActiveClickType == AUTOCLICK_TYPE_SCROLL) {
		exitScrollMode();
		}
		}
		}

+21 −0

Original line number	Diff line number	Diff line
		@@ -645,6 +645,27 @@ public class AutoclickControllerTest {
		assertThat(mController.mClickScheduler.getScheduledClickTimeForTesting()).isEqualTo(-1);
		}

		@Test
		@EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
		public void toggleAutoclickPause_inScrollMode_exitsScrollMode() {
		// Initialize the controller.
		injectFakeMouseActionHoverMoveEvent();

		// Set the active click type to scroll.
		mController.clickPanelController.handleAutoclickTypeChange(
		AutoclickTypePanel.AUTOCLICK_TYPE_SCROLL);
		mController.mAutoclickScrollPanel.show();

		// Verify it's visible before pause.
		assertThat(mController.mAutoclickScrollPanel.isVisible()).isTrue();

		// Pause autoclick.
		mController.clickPanelController.toggleAutoclickPause(true);

		// Verify scroll panel is now hidden.
		assertThat(mController.mAutoclickScrollPanel.isVisible()).isFalse();
		}

		@Test
		@EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
		public void onMotionEvent_flagOn_lazyInitAutoclickScrollPanel() {