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

Commit f3f9d84f authored by Gavin Williams's avatar Gavin Williams
Browse files

a11y: Refactor click canceling 

This refactor makes all instances where a scheduled click should be
canceled call the same logic.

Bug: b/388847769
Test: AutoclickControllerTest
Flag: com.android.server.accessibility.enable_autoclick_indicator
Change-Id: I5885cf556883c278df646aef6f9141cb7cd96f0f
parent 2506c1c9

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

+7 −7
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            if (!isPaused()) {

                handleMouseMotion(event, policyFlags);

            }

        } else if (mClickScheduler != null) {

            mClickScheduler.cancel();

        } else {

            cancelPendingClick();

        }



        super.onMotionEvent(event, rawEvent, policyFlags);
@@ -238,7 +238,7 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            if (KeyEvent.isModifierKey(event.getKeyCode())) {

                mClickScheduler.updateMetaState(event.getMetaState());

            } else {

                mClickScheduler.cancel();

                cancelPendingClick();

            }

        }
@@ -247,8 +247,8 @@ public class AutoclickController extends BaseEventStreamTransformation { 


    @Override

    public void clearEvents(int inputSource) {

        if (inputSource == InputDevice.SOURCE_MOUSE && mClickScheduler != null) {

            mClickScheduler.cancel();

        if (inputSource == InputDevice.SOURCE_MOUSE) {

            cancelPendingClick();

        }



        if (mAutoclickScrollPanel != null) {
@@ -288,7 +288,7 @@ public class AutoclickController extends BaseEventStreamTransformation { 
                if (event.getPointerCount() == 1) {

                    mClickScheduler.update(event, policyFlags);

                } else {

                    mClickScheduler.cancel();

                    cancelPendingClick();

                }

            } break;

            // Ignore hover enter and exit.
@@ -296,7 +296,7 @@ public class AutoclickController extends BaseEventStreamTransformation { 
            case MotionEvent.ACTION_HOVER_EXIT:

                break;

            default:

                mClickScheduler.cancel();

                cancelPendingClick();

        }

    }