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

Commit 5e996f90 authored by Katie's avatar Katie Committed by Katie Dektar
Browse files

Rename Gantry flag for fullscreen magnifier + mouse bugfix 

Fullscreen magnifier moves with mouse is now a bugfix instead
of a feature, so we must rename the flag.

Bug: 354696546
Test: Existing
Flag: com.server.accessibility.enable_magnification_follows_mouse
Change-Id: I3d8289396fa4e951238cf64d503ce37e5a0f9e1f
parent 35dbe694

services/accessibility/accessibility.aconfig

+4 −1
Original line number Diff line number Diff line
@@ -114,10 +114,13 @@ flag { 
}



flag {

    name: "enable_magnification_follows_mouse"

    name: "enable_magnification_follows_mouse_bugfix"

    namespace: "accessibility"

    description: "Whether to enable mouse following for fullscreen magnification"

    bug: "354696546"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

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

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 


    @Override

    void handleMouseOrStylusEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) {

        if (Flags.enableMagnificationFollowsMouse()) {

        if (Flags.enableMagnificationFollowsMouseBugfix()) {

            if (mFullScreenMagnificationController.isActivated(mDisplayId)) {

                // TODO(b/354696546): Allow mouse/stylus to activate whichever display they are

                // over, rather than only interacting with the current display.
@@ -1206,7 +1206,7 @@ public class FullScreenMagnificationGestureHandler extends MagnificationGestureH 


        protected void cacheDelayedMotionEvent(MotionEvent event, MotionEvent rawEvent,

                int policyFlags) {

            if (Flags.enableMagnificationFollowsMouse()

            if (Flags.enableMagnificationFollowsMouseBugfix()

                    && !event.isFromSource(SOURCE_TOUCHSCREEN)) {

                // Only touch events need to be cached and sent later.

                return;

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

+2 −1
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ public abstract class MagnificationGestureHandler extends BaseEventStreamTransfo 
            } break;

            case SOURCE_MOUSE:

            case SOURCE_STYLUS: {

                if (magnificationShortcutExists() && Flags.enableMagnificationFollowsMouse()) {

                if (magnificationShortcutExists()

                        && Flags.enableMagnificationFollowsMouseBugfix()) {

                    handleMouseOrStylusEvent(event, rawEvent, policyFlags);

                }

            }

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

+10 −10
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ public class FullScreenMagnificationGestureHandlerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testMouseMoveEventsDoNotMoveMagnifierViewport() {

        runMoveEventsDoNotMoveMagnifierViewport(InputDevice.SOURCE_MOUSE);

    }
@@ -1471,55 +1471,55 @@ public class FullScreenMagnificationGestureHandlerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testMouseHoverMoveEventsDoNotMoveMagnifierViewport() {

        runHoverMoveEventsDoNotMoveMagnifierViewport(InputDevice.SOURCE_MOUSE);

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testStylusHoverMoveEventsDoNotMoveMagnifierViewport() {

        runHoverMoveEventsDoNotMoveMagnifierViewport(InputDevice.SOURCE_STYLUS);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testMouseHoverMoveEventsMoveMagnifierViewport() {

        runHoverMovesViewportTest(InputDevice.SOURCE_MOUSE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testStylusHoverMoveEventsMoveMagnifierViewport() {

        runHoverMovesViewportTest(InputDevice.SOURCE_STYLUS);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testMouseDownEventsDoNotMoveMagnifierViewport() {

        runDownDoesNotMoveViewportTest(InputDevice.SOURCE_MOUSE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testStylusDownEventsDoNotMoveMagnifierViewport() {

        runDownDoesNotMoveViewportTest(InputDevice.SOURCE_STYLUS);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testMouseUpEventsDoNotMoveMagnifierViewport() {

        runUpDoesNotMoveViewportTest(InputDevice.SOURCE_MOUSE);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testStylusUpEventsDoNotMoveMagnifierViewport() {

        runUpDoesNotMoveViewportTest(InputDevice.SOURCE_STYLUS);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void testMouseMoveEventsMoveMagnifierViewport() {

        final EventCaptor eventCaptor = new EventCaptor();

        mMgh.setNext(eventCaptor);

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

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class MagnificationGestureHandlerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void onMotionEvent_isFromMouse_handleMouseOrStylusEvent() {

        final MotionEvent mouseEvent = MotionEvent.obtain(0, 0, ACTION_HOVER_MOVE, 0, 0, 0);

        mouseEvent.setSource(InputDevice.SOURCE_MOUSE);
@@ -108,7 +108,7 @@ public class MagnificationGestureHandlerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsEnabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void onMotionEvent_isFromStylus_handleMouseOrStylusEvent() {

        final MotionEvent stylusEvent = MotionEvent.obtain(0, 0, ACTION_HOVER_MOVE, 0, 0, 0);

        stylusEvent.setSource(InputDevice.SOURCE_STYLUS);
@@ -123,7 +123,7 @@ public class MagnificationGestureHandlerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void onMotionEvent_isFromMouse_handleMouseOrStylusEventNotCalled() {

        final MotionEvent mouseEvent = MotionEvent.obtain(0, 0, ACTION_HOVER_MOVE, 0, 0, 0);

        mouseEvent.setSource(InputDevice.SOURCE_MOUSE);
@@ -138,7 +138,7 @@ public class MagnificationGestureHandlerTest { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE)

    @RequiresFlagsDisabled(Flags.FLAG_ENABLE_MAGNIFICATION_FOLLOWS_MOUSE_BUGFIX)

    public void onMotionEvent_isFromStylus_handleMouseOrStylusEventNotCalled() {

        final MotionEvent stylusEvent = MotionEvent.obtain(0, 0, ACTION_HOVER_MOVE, 0, 0, 0);

        stylusEvent.setSource(InputDevice.SOURCE_STYLUS);