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

Commit bf50dff4 authored by Roy Chou's avatar Roy Chou
Browse files

chore(magnification): remove flag delay_show_magnification_button usage 

The flag has been already in nextfood about 2 monthes. Remove the flag
usage then we'll delete the flag after released.

Bug: 358504461
Flag: com.android.systemui.delay_show_magnification_button
Test: manually
      atest IMagnificationConnectionTest
      atest MagnificationSettingsControllerTest
      atest WindowMagnificationSettingsTest
Change-Id: I30954a9873ddaf9fc6ac2b1ac3f2fc159b8b5044
parent 61061c58

packages/SystemUI/src/com/android/systemui/accessibility/MagnificationImpl.java

+7 −13
Original line number Diff line number Diff line
@@ -415,7 +415,6 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
    @Override

    @MainThread

    public void showMagnificationButton(int displayId, int magnificationMode) {

        if (Flags.delayShowMagnificationButton()) {

        if (mHandler.hasMessages(MSG_SHOW_MAGNIFICATION_BUTTON_INTERNAL)) {

            return;

        }
@@ -423,9 +422,6 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
                mHandler.obtainMessage(

                        MSG_SHOW_MAGNIFICATION_BUTTON_INTERNAL, displayId, magnificationMode),

                DELAY_SHOW_MAGNIFICATION_TIMEOUT_MS);

        } else {

            showMagnificationButtonInternal(displayId, magnificationMode);

        }

    }



    @MainThread
@@ -441,9 +437,7 @@ public class MagnificationImpl implements Magnification, CommandQueue.Callbacks 
    @Override

    @MainThread

    public void removeMagnificationButton(int displayId) {

        if (Flags.delayShowMagnificationButton()) {

        mHandler.removeMessages(MSG_SHOW_MAGNIFICATION_BUTTON_INTERNAL);

        }

        mModeSwitchesController.removeButton(displayId);

    }

packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java

+3 −31
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.hardware.display.DisplayManager;

import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.Settings;

import android.testing.TestableLooper;

import android.view.Display;
@@ -49,7 +45,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 
import androidx.test.filters.SmallTest;



import com.android.app.viewcapture.ViewCaptureAwareWindowManager;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.model.SysUiState;

import com.android.systemui.recents.OverviewProxyService;
@@ -58,7 +53,6 @@ import com.android.systemui.statusbar.CommandQueue; 
import com.android.systemui.util.settings.SecureSettings;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -73,9 +67,6 @@ import org.mockito.MockitoAnnotations; 
@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class IMagnificationConnectionTest extends SysuiTestCase {



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private static final int TEST_DISPLAY = Display.DEFAULT_DISPLAY;

    @Mock

    private AccessibilityManager mAccessibilityManager;
@@ -198,22 +189,7 @@ public class IMagnificationConnectionTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON)

    public void showMagnificationButton_flagOff_directlyShowButton() throws RemoteException {

        // magnification settings panel should not be showing

        assertFalse(mMagnification.isMagnificationSettingsPanelShowing(TEST_DISPLAY));



        mIMagnificationConnection.showMagnificationButton(TEST_DISPLAY,

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

        processAllPendingMessages();



        verify(mModeSwitchesController).showButton(TEST_DISPLAY,

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON)

    public void showMagnificationButton_flagOn_delayedShowButton() throws RemoteException {

    public void showMagnificationButton_delayedShowButton() throws RemoteException {

        // magnification settings panel should not be showing

        assertFalse(mMagnification.isMagnificationSettingsPanelShowing(TEST_DISPLAY));
@@ -243,12 +219,9 @@ public class IMagnificationConnectionTest extends SysuiTestCase { 
        // showMagnificationButton request to Magnification.

        processAllPendingMessages();



        // If the flag is on, the isMagnificationSettingsShowing will be checked after timeout, so

        // The isMagnificationSettingsShowing will be checked after timeout, so

        // process all message after a timeout here to verify the showButton will not be called.

        int timeout = Flags.delayShowMagnificationButton()

                ? DELAY_SHOW_MAGNIFICATION_TIMEOUT_MS + 100

                : 0;

        processAllPendingMessages(timeout);

        processAllPendingMessages(DELAY_SHOW_MAGNIFICATION_TIMEOUT_MS + 100);

        verify(mModeSwitchesController, never()).showButton(TEST_DISPLAY,

                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);

    }
@@ -262,7 +235,6 @@ public class IMagnificationConnectionTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_DELAY_SHOW_MAGNIFICATION_BUTTON)

    public void removeMagnificationButton_delayingShowButton_doNotShowButtonAfterTimeout()

            throws RemoteException {

        // magnification settings panel should not be showing