Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6efef540 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Revert "a11y: Ignore cursor area size when hovering panel" 

This reverts commit 0cf35488.

Reason for revert: DroidMonitor: Potential culprit for http://b/406787801 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Change-Id: Ic73cfe004e51d539d445701ba6632ad9d3982b32
parent 0cf35488

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

+4 −7
Original line number Diff line number Diff line
@@ -303,10 +303,10 @@ public class AutoclickController extends BaseEventStreamTransformation { 


    private boolean isPaused() {

        return Flags.enableAutoclickIndicator() && mAutoclickTypePanel.isPaused()

                && !isPanelHovered();

                && !isHovered();

    }



    private boolean isPanelHovered() {

    private boolean isHovered() {

        return Flags.enableAutoclickIndicator() && mAutoclickTypePanel.isHovered();

    }
@@ -809,7 +809,7 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            }

            mLastMotionEvent = MotionEvent.obtain(event);

            mEventPolicyFlags = policyFlags;

            mHoveredState = isPanelHovered();

            mHoveredState = isHovered();



            if (useAsAnchor) {

                final int pointerIndex = mLastMotionEvent.getActionIndex();
@@ -849,11 +849,8 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            float deltaX = mAnchorCoords.x - event.getX(pointerIndex);

            float deltaY = mAnchorCoords.y - event.getY(pointerIndex);

            double delta = Math.hypot(deltaX, deltaY);

            // If the panel is hovered, use the default slop so it's easier to click the closely

            // spaced buttons.

            double slop =

                    ((Flags.enableAutoclickIndicator() && mIgnoreMinorCursorMovement

                            && !isPanelHovered())

                    ((Flags.enableAutoclickIndicator() && mIgnoreMinorCursorMovement)

                            ? mMovementSlop

                            : DEFAULT_MOVEMENT_SLOP);

            return delta > slop;

services/tests/servicestests/src/com/android/server/accessibility/autoclick/AutoclickControllerTest.java

+0 −37
Original line number Diff line number Diff line
@@ -776,43 +776,6 @@ public class AutoclickControllerTest { 
                MotionEvent.BUTTON_PRIMARY);

    }



    @Test

    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)

    public void hoverOnAutoclickPanel_useDefaultCursorArea() {

        MotionEventCaptor motionEventCaptor = new MotionEventCaptor();

        mController.setNext(motionEventCaptor);



        injectFakeMouseActionHoverMoveEvent();

        // Set delay to zero so click is scheduled to run immediately.

        mController.mClickScheduler.updateDelay(0);



        // Set an extra large cursor area size and enable ignore minor cursor movement.

        int customSize = 250;

        Settings.Secure.putIntForUser(mTestableContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE,

                customSize,

                mTestableContext.getUserId());

        mController.onChangeForTesting(/* selfChange= */ true,

                Settings.Secure.getUriFor(

                        Settings.Secure.ACCESSIBILITY_AUTOCLICK_CURSOR_AREA_SIZE));

        enableIgnoreMinorCursorMovement();



        // Set mouse to hover panel.

        AutoclickTypePanel mockAutoclickTypePanel = mock(AutoclickTypePanel.class);

        when(mockAutoclickTypePanel.isHovered()).thenReturn(true);

        mController.mAutoclickTypePanel = mockAutoclickTypePanel;



        // Send a hover move event that's within than the cursor area size. Normally because

        // ignoreMinorCursorMovement is enabled this wouldn't trigger a click. But since the panel

        // is hovered a click is expected.

        injectFakeMouseMoveEvent(/* x= */ 30f, /* y= */ 0, MotionEvent.ACTION_HOVER_MOVE);

        mTestableLooper.processAllMessages();



        // Verify the expected left click.

        assertThat(motionEventCaptor.eventCount).isEqualTo(

                getNumEventsExpectedFromClick(/* numClicks= */ 1));

    }



    @Test

    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_AUTOCLICK_INDICATOR)

    public void sendClick_updateLastCursorAndScrollAtThatLocation() {