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

Commit fba79d86 authored by Hiroki Sato's avatar Hiroki Sato
Browse files

Simplify MouseEventHandler construction 

This simplifies MouseEventHandler construction so that it's
created inside FullScreenMagnificationGestureHandler, and there's no
need for A11yInputFilter to know about it.

Bug: 361817142
Test: FullScreenMagnificationGestureHandlerTest AccessibilityInputFilterTest
Flag: EXEMPT refactor
Change-Id: Iba9ec12c8e9afacaf4522533292967c8e59b549d
parent 425e2a21

services/accessibility/java/com/android/server/accessibility/AccessibilityInputFilter.java

+1 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ import com.android.server.accessibility.magnification.FullScreenMagnificationGes 
import com.android.server.accessibility.magnification.FullScreenMagnificationVibrationHelper;

import com.android.server.accessibility.magnification.MagnificationGestureHandler;

import com.android.server.accessibility.magnification.MagnificationKeyHandler;

import com.android.server.accessibility.magnification.MouseEventHandler;

import com.android.server.accessibility.magnification.WindowMagnificationGestureHandler;

import com.android.server.accessibility.magnification.WindowMagnificationPromptController;

import com.android.server.policy.WindowManagerPolicy;
@@ -899,8 +898,7 @@ class AccessibilityInputFilter extends InputFilter implements EventStreamTransfo 
                            triggerable,

                            new WindowMagnificationPromptController(displayContext, mUserId),

                            displayId,

                            fullScreenMagnificationVibrationHelper,

                            new MouseEventHandler(controller));

                            fullScreenMagnificationVibrationHelper);

        }

        return magnificationGestureHandler;

    }

services/accessibility/java/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandler.java

+5 −8
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 
    private final int mMinimumVelocity;

    private final int mMaximumVelocity;



    private MouseEventHandler mMouseEventHandler;

    private final MouseEventHandler mMouseEventHandler;



    public FullScreenMagnificationGestureHandler(

            @UiContext Context context,
@@ -194,8 +194,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 
            boolean detectShortcutTrigger,

            @NonNull WindowMagnificationPromptController promptController,

            int displayId,

            FullScreenMagnificationVibrationHelper fullScreenMagnificationVibrationHelper,

            MouseEventHandler mouseEventHandler) {

            FullScreenMagnificationVibrationHelper fullScreenMagnificationVibrationHelper) {

        this(

                context,

                fullScreenMagnificationController,
@@ -210,8 +209,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 
                /* magnificationLogger= */ null,

                ViewConfiguration.get(context),

                new OneFingerPanningSettingsProvider(

                        context, Flags.enableMagnificationOneFingerPanningGesture()),

                mouseEventHandler);

                        context, Flags.enableMagnificationOneFingerPanningGesture()));

    }



    /** Constructor for tests. */
@@ -229,8 +227,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 
            FullScreenMagnificationVibrationHelper fullScreenMagnificationVibrationHelper,

            MagnificationLogger magnificationLogger,

            ViewConfiguration viewConfiguration,

            OneFingerPanningSettingsProvider oneFingerPanningSettingsProvider,

            MouseEventHandler mouseEventHandler) {

            OneFingerPanningSettingsProvider oneFingerPanningSettingsProvider) {

        super(displayId, detectSingleFingerTripleTap, detectTwoFingerTripleTap,

                detectShortcutTrigger, trace, callback);

        if (DEBUG_ALL) {
@@ -316,7 +313,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 
        mOverscrollEdgeSlop = context.getResources().getDimensionPixelSize(

                R.dimen.accessibility_fullscreen_magnification_gesture_edge_slop);

        mIsWatch = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);

        mMouseEventHandler = mouseEventHandler;

        mMouseEventHandler = new MouseEventHandler(mFullScreenMagnificationController);



        if (mDetectShortcutTrigger) {

            mScreenStateReceiver = new ScreenStateReceiver(context, this);

services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java

+5 −6
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ public class FullScreenMagnificationGestureHandlerTest { 
                        mMockFullScreenMagnificationVibrationHelper,

                        mMockMagnificationLogger,

                        ViewConfiguration.get(mContext),

                        mMockOneFingerPanningSettingsProvider,

                        new MouseEventHandler(mFullScreenMagnificationController));

                        mMockOneFingerPanningSettingsProvider);

        // OverscrollHandler is only supported on watches.

        // @See config_enable_a11y_fullscreen_magnification_overscroll_handler

        if (isWatch()) {
@@ -482,8 +481,8 @@ public class FullScreenMagnificationGestureHandlerTest { 
    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)

    public void testDisablingTripleTap_removesInputLag() {

        mMgh = newInstance(/* detectSingleFingerTripleTap */ false,

                /* detectTwoFingerTripleTap */ true, /* detectShortcut */ true);

        mMgh = newInstance(/* detectSingleFingerTripleTap= */ false,

                /* detectTwoFingerTripleTap= */ true, /* detectShortcutTrigger= */ true);

        goFromStateIdleTo(STATE_IDLE);

        allowEventDelegation();

        tap();
@@ -494,8 +493,8 @@ public class FullScreenMagnificationGestureHandlerTest { 
    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_MULTIPLE_FINGER_MULTIPLE_TAP_GESTURE)

    public void testDisablingSingleFingerTripleTapAndTwoFingerTripleTap_removesInputLag() {

        mMgh = newInstance(/* detectSingleFingerTripleTap */ false,

                /* detectTwoFingerTripleTap */ false, /* detectShortcut */ true);

        mMgh = newInstance(/* detectSingleFingerTripleTap= */ false,

                /* detectTwoFingerTripleTap= */ false, /* detectShortcutTrigger= */ true);

        goFromStateIdleTo(STATE_IDLE);

        allowEventDelegation();

        tap();