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

Commit a5c067fa authored by Candice's avatar Candice
Browse files

Clean up flag(1): com.android.window.flags.always_draw_magnification_fullscreen_border 

Clean up the flag usages in the services/accessibility directory.

Bug: 377211252
Test: atest FullScreenMagnificationControllerTest
Test: atest MagnificationControllerTest
Test: atest AccessibilityManagerServiceTest
Flag: com.android.window.flags.always_draw_magnification_fullscreen_border
Change-Id: I78aeb95c7b21170f1536c9d3f85e96e993ee2ef4
parent d3fe479d

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

+2 −9
Original line number Original line Diff line number Diff line
@@ -3797,13 +3797,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
                || (Flags.enableMagnificationMultipleFingerMultipleTapGesture()

                || (Flags.enableMagnificationMultipleFingerMultipleTapGesture()

                    && userState.isMagnificationTwoFingerTripleTapEnabledLocked()));

                    && userState.isMagnificationTwoFingerTripleTapEnabledLocked()));





        final boolean createConnectionForCurrentCapability =

        final boolean connect = shortcutEnabled || userHasMagnificationServicesLocked(userState);

                com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder()

                        || (userState.getMagnificationCapabilitiesLocked()

                                != Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);



        final boolean connect = (shortcutEnabled && createConnectionForCurrentCapability)

                || userHasMagnificationServicesLocked(userState);





        getMagnificationConnectionManager().requestConnection(connect);

        getMagnificationConnectionManager().requestConnection(connect);

    }

    }
@@ -4854,8 +4848,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 




        getMagnificationConnectionManager().setConnection(connection);

        getMagnificationConnectionManager().setConnection(connection);





        if (com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder()

        if (connection == null

                && connection == null

                && mMagnificationController.isFullScreenMagnificationControllerInitialized()) {

                && mMagnificationController.isFullScreenMagnificationControllerInitialized()) {

            // Since the connection does not exist, the system ui cannot provide the border

            // Since the connection does not exist, the system ui cannot provide the border

            // implementation for fullscreen magnification. So we call reset to deactivate the

            // implementation for fullscreen magnification. So we call reset to deactivate the

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -699,10 +699,9 @@ public class FullScreenMagnificationController implements 
            if (!mRegistered) {

            if (!mRegistered) {

                return false;

                return false;

            }

            }

            // If the border implementation is on system ui side but the connection is not

            // The border implementation is on system ui side but the connection is not

            // established, the fullscreen magnification should not work.

            // established, the fullscreen magnification should not work.

            if (com.android.window.flags.Flags.alwaysDrawMagnificationFullscreenBorder()

            if (!mMagnificationConnectionStateSupplier.get()) {

                    && !mMagnificationConnectionStateSupplier.get()) {

                return false;

                return false;

            }

            }

            if (DEBUG) {

            if (DEBUG) {

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

+2 −5
Original line number Original line Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.server.LocalServices;

import com.android.server.LocalServices;

import com.android.server.accessibility.AccessibilityManagerService;

import com.android.server.accessibility.AccessibilityManagerService;

import com.android.server.wm.WindowManagerInternal;

import com.android.server.wm.WindowManagerInternal;

import com.android.window.flags.Flags;





import java.util.concurrent.Executor;

import java.util.concurrent.Executor;
@@ -634,10 +633,8 @@ public class MagnificationController implements MagnificationConnectionManager.C 




    @Override

    @Override

    public void onFullScreenMagnificationActivationState(int displayId, boolean activated) {

    public void onFullScreenMagnificationActivationState(int displayId, boolean activated) {

        if (Flags.alwaysDrawMagnificationFullscreenBorder()) {

        getMagnificationConnectionManager()

        getMagnificationConnectionManager()

                .onFullscreenMagnificationActivationChanged(displayId, activated);

                .onFullscreenMagnificationActivationChanged(displayId, activated);

        }





        if (activated) {

        if (activated) {

            synchronized (mLock) {

            synchronized (mLock) {

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh 
import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;

import static com.android.internal.accessibility.common.ShortcutConstants.UserShortcutType.SOFTWARE;

import static com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity.EXTRA_TYPE_TO_CHOOSE;

import static com.android.internal.accessibility.dialog.AccessibilityButtonChooserActivity.EXTRA_TYPE_TO_CHOOSE;

import static com.android.server.accessibility.AccessibilityManagerService.ACTION_LAUNCH_HEARING_DEVICES_DIALOG;

import static com.android.server.accessibility.AccessibilityManagerService.ACTION_LAUNCH_HEARING_DEVICES_DIALOG;

import static com.android.window.flags.Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER;





import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertThat;
@@ -601,7 +600,6 @@ public class AccessibilityManagerServiceTest { 
    }

    }





    @Test

    @Test

    @EnableFlags(FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER)

    public void testSetConnectionNull_borderFlagEnabled_unregisterFullScreenMagnification()

    public void testSetConnectionNull_borderFlagEnabled_unregisterFullScreenMagnification()

            throws RemoteException {

            throws RemoteException {

        mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE);

        mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE);

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MOD 
import static com.android.server.accessibility.Flags.FLAG_MAGNIFICATION_ENLARGE_POINTER_BUGFIX;

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.FullScreenMagnificationController.MagnificationInfoChangedCallback;

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

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

import static com.android.window.flags.Flags.FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertFalse;
@@ -308,7 +307,6 @@ public class FullScreenMagnificationControllerTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(FLAG_ALWAYS_DRAW_MAGNIFICATION_FULLSCREEN_BORDER)

    public void testSetScale_noConnection_doNothing() {

    public void testSetScale_noConnection_doNothing() {

        register(TEST_DISPLAY);

        register(TEST_DISPLAY);