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

Commit 7490b43a authored by Hiroki Sato's avatar Hiroki Sato
Browse files

Move magnification_enlarge_pointer aconfig to bugfix flag 

This is now rolled out as a bugfix.

Bug: 355734856
Test: atest com.android.server.accessibility.magnification (with/without flag enabled)
Flag: com.android.server.accessibility.magnification_enlarge_pointer_bugfix

Change-Id: Ia08e3192577e991acda9a1293fe40a39b2f32f70
parent 8ae058d1

services/accessibility/accessibility.aconfig

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



flag {

    name: "magnification_enlarge_pointer"

    name: "magnification_enlarge_pointer_bugfix"

    namespace: "accessibility"

    description: "When fullscreen magnification is enabled, pointer icon is enlarged"

    bug: "355734856"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

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

+1 −1
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ public class FullScreenMagnificationController implements 
     * @param scale     The new scale factor.

     */

    public void notifyScaleForInput(int displayId, float scale) {

        if (Flags.magnificationEnlargePointer()) {

        if (Flags.magnificationEnlargePointerBugfix()) {

            mControllerCtx.getInputManager()

                    .setAccessibilityPointerIconScaleFactor(displayId, scale);

        }

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

+7 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server.accessibility.magnification; 


import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;



import static com.android.server.accessibility.Flags.FLAG_MAGNIFICATION_ENLARGE_POINTER;

import static com.android.server.accessibility.Flags.FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX;

import static com.android.server.accessibility.magnification.FullScreenMagnificationController.MagnificationInfoChangedCallback;

import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY;

import static com.android.window.flags.Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER;
@@ -1484,7 +1484,7 @@ public class FullScreenMagnificationControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)

    public void persistScale_setValue_notifyInput() {

        register(TEST_DISPLAY);
@@ -1504,7 +1504,7 @@ public class FullScreenMagnificationControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)

    public void setScale_setNonTransientScale_notifyInput() {

        register(TEST_DISPLAY);
@@ -1516,7 +1516,7 @@ public class FullScreenMagnificationControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)

    public void setScaleAndCenter_setTransientScale_notNotifyInput() {

        register(TEST_DISPLAY);
@@ -1531,7 +1531,7 @@ public class FullScreenMagnificationControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)

    public void setScaleAndCenter_setNonTransientScale_notifyInput() {

        register(TEST_DISPLAY);
@@ -1543,7 +1543,7 @@ public class FullScreenMagnificationControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)

    public void setCenter_notNotifyInput() {

        register(TEST_DISPLAY);
@@ -1561,7 +1561,7 @@ public class FullScreenMagnificationControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER)

    @RequiresFlagsEnabled(FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX)

    public void offsetMagnifiedRegion_notNotifyInput() {

        register(TEST_DISPLAY);