a11y: Remove indicator when hovering on directional buttons

Autoclick indicator appears on all scroll panel buttons, causing visual
distraction during scrolling. We should remove the indicator when it is
on directional buttons.

Video: http://shortn/_XJT8X9VxAF

Bug: b/403624552
Test: AutoclickControllerTest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: Ia0fb0387e6e1d3ee1cf846a8c7dfaa9f0967fd51

2 files changed, 32 insertions, 3 deletions

diff --git a/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java b/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java
index 0b9c45de6e40..60343e9e81e5 100644
--- a/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java
+++ b/services/accessibility/java/com/android/server/accessibility/autoclick/AutoclickController.java
@@ -152,9 +152,20 @@ public class AutoclickController extends BaseEventStreamTransformation {
                     if (direction == AutoclickScrollPanel.DIRECTION_EXIT) {
                         return;
                     }
-                    // For direction buttons, perform scroll action immediately.
-                    if (hovered && direction != AutoclickScrollPanel.DIRECTION_NONE) {
-                        handleScroll(direction);
+
+                    // Handle all non-exit buttons when hovered.
+                    if (hovered) {
+                        // Clear the indicator.
+                        if (mAutoclickIndicatorScheduler != null) {
+                            mAutoclickIndicatorScheduler.cancel();
+                            if (mAutoclickIndicatorView != null) {
+                                mAutoclickIndicatorView.clearIndicator();
+                            }
+                        }
+                        // Perform scroll action.
+                        if (direction != DIRECTION_NONE) {
+                            handleScroll(direction);
+                        }
                     }
                 }
             };
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java
index 99c922ca30c4..df77866b5e7f 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java
@@ -25,6 +25,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -866,6 +867,23 @@ public class AutoclickControllerTest {
 
     @Test
     @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
+    public void scrollPanelController_directionalButtonsHideIndicator() {
+        injectFakeMouseActionHoverMoveEvent();
+
+        // Create a spy on the real object to verify method calls.
+        AutoclickIndicatorView spyIndicatorView = spy(mController.mAutoclickIndicatorView);
+        mController.mAutoclickIndicatorView = spyIndicatorView;
+
+        // Simulate hover on direction button.
+        mController.mScrollPanelController.onHoverButtonChange(
+                AutoclickScrollPanel.DIRECTION_UP, true);
+
+        // Verify clearIndicator was called.
+        verify(spyIndicatorView).clearIndicator();
+    }
+
+    @Test
+    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)
     public void hoverOnAutoclickPanel_rightClickType_forceTriggerLeftClick() {
         MotionEventCaptor motionEventCaptor = new MotionEventCaptor();
         mController.setNext(motionEventCaptor);