Merge "a11y: Clicking exit to exit scroll mode" into main (25f6ae27) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,9 @@ public class AutoclickScrollPanel {
		setupHoverListenerForButton(mRightButton, DIRECTION_RIGHT);
		setupHoverListenerForButton(mDownButton, DIRECTION_DOWN);
		setupHoverListenerForButton(mExitButton, DIRECTION_EXIT);

		// Add click listener for exit button.
		mExitButton.setOnClickListener(v -> hide());
		}

		/**

+15 −0

Original line number	Diff line number	Diff line
		@@ -335,6 +335,21 @@ public class AutoclickScrollPanelTest {
		assertThat(params.y).isLessThan(cursorY);
		}

		@Test
		public void exitButton_click_hidesPanel() {
		float cursorX = 300;
		float cursorY = 300;

		mScrollPanel.show(cursorX, cursorY);
		assertThat(mScrollPanel.isVisible()).isTrue();

		// Simulate clicking the exit button.
		mExitButton.performClick();

		// Verify the panel is hidden.
		assertThat(mScrollPanel.isVisible()).isFalse();
		}

		// Helper method to simulate a hover event on a view.
		private void triggerHoverEvent(View view, int action) {
		MotionEvent event = MotionEvent.obtain(