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

Commit e21759a7 authored by Riley Jones's avatar Riley Jones
Browse files

Cleanup qs flag for CommandQueue 

Bug: 367414968
Test: atest CommandQueueTest
Flag: EXEMPT flag cleanup
Change-Id: I805602bde81ad6611c12a864e4456665c60b7bc0
parent 80bf108c

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/CommandQueueTest.java

+3 −29
Original line number Original line Diff line number Diff line
@@ -23,8 +23,8 @@ import static android.service.quickaccesswallet.Flags.FLAG_LAUNCH_WALLET_VIA_SYS 
import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.WindowInsetsController.BEHAVIOR_DEFAULT;

import static android.view.WindowInsetsController.BEHAVIOR_DEFAULT;





import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -35,14 +35,12 @@ import android.hardware.biometrics.IBiometricSysuiReceiver; 
import android.hardware.biometrics.PromptInfo;

import android.hardware.biometrics.PromptInfo;

import android.hardware.fingerprint.IUdfpsRefreshRateRequestCallback;

import android.hardware.fingerprint.IUdfpsRefreshRateRequestCallback;

import android.os.Bundle;

import android.os.Bundle;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.EnableFlags;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.WindowInsets;

import android.view.WindowInsets;

import android.view.WindowInsets.Type.InsetsType;

import android.view.WindowInsets.Type.InsetsType;

import android.view.WindowInsetsController.Appearance;

import android.view.WindowInsetsController.Appearance;

import android.view.WindowInsetsController.Behavior;

import android.view.WindowInsetsController.Behavior;

import android.view.accessibility.Flags;





import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;
@@ -385,30 +383,7 @@ public class CommandQueueTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    public void addQsTile() {

    public void addQsTile_withA11yQsShortcutFlagOff() {

        ComponentName c = new ComponentName("testpkg", "testcls");



        mCommandQueue.addQsTile(c);

        waitForIdleSync();



        verify(mCallbacks).addQsTile(eq(c));

    }



    @Test

    @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    public void addQsTileToFrontOrEnd_withA11yQsShortcutFlagOff_doNothing() {

        ComponentName c = new ComponentName("testpkg", "testcls");



        mCommandQueue.addQsTileToFrontOrEnd(c, true);

        waitForIdleSync();



        verifyNoMoreInteractions(mCallbacks);

    }



    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    public void addQsTile_withA11yQsShortcutFlagOn() {

        ComponentName c = new ComponentName("testpkg", "testcls");

        ComponentName c = new ComponentName("testpkg", "testcls");





        mCommandQueue.addQsTile(c);

        mCommandQueue.addQsTile(c);
@@ -418,8 +393,7 @@ public class CommandQueueTest extends SysuiTestCase { 
    }

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)

    public void addQsTileAtTheEnd() {

    public void addQsTileAtTheEnd_withA11yQsShortcutFlagOn() {

        ComponentName c = new ComponentName("testpkg", "testcls");

        ComponentName c = new ComponentName("testpkg", "testcls");





        mCommandQueue.addQsTileToFrontOrEnd(c, true);

        mCommandQueue.addQsTileToFrontOrEnd(c, true);

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+11 −26
Original line number Original line Diff line number Diff line
@@ -58,7 +58,6 @@ import android.view.KeyEvent; 
import android.view.WindowInsets.Type.InsetsType;

import android.view.WindowInsets.Type.InsetsType;

import android.view.WindowInsetsController.Appearance;

import android.view.WindowInsetsController.Appearance;

import android.view.WindowInsetsController.Behavior;

import android.view.WindowInsetsController.Behavior;

import android.view.accessibility.Flags;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;
@@ -980,13 +979,7 @@ public class CommandQueue extends IStatusBar.Stub implements 




    @Override

    @Override

    public void addQsTile(ComponentName tile) {

    public void addQsTile(ComponentName tile) {

        if (Flags.a11yQsShortcut()) {

        addQsTileToFrontOrEnd(tile, false);

        addQsTileToFrontOrEnd(tile, false);

        } else {

            synchronized (mLock) {

                mHandler.obtainMessage(MSG_ADD_QS_TILE, tile).sendToTarget();

            }

        }

    }

    }





    /**

    /**
@@ -996,7 +989,6 @@ public class CommandQueue extends IStatusBar.Stub implements 
     */

     */

    @Override

    @Override

    public void addQsTileToFrontOrEnd(ComponentName tile, boolean end) {

    public void addQsTileToFrontOrEnd(ComponentName tile, boolean end) {

        if (Flags.a11yQsShortcut()) {

        synchronized (mLock) {

        synchronized (mLock) {

            SomeArgs args = SomeArgs.obtain();

            SomeArgs args = SomeArgs.obtain();

            args.arg1 = tile;

            args.arg1 = tile;
@@ -1004,7 +996,6 @@ public class CommandQueue extends IStatusBar.Stub implements 
            mHandler.obtainMessage(MSG_ADD_QS_TILE, args).sendToTarget();

            mHandler.obtainMessage(MSG_ADD_QS_TILE, args).sendToTarget();

        }

        }

    }

    }

    }





    @Override

    @Override

    public void remQsTile(ComponentName tile) {

    public void remQsTile(ComponentName tile) {
@@ -1676,18 +1667,12 @@ public class CommandQueue extends IStatusBar.Stub implements 
                    }

                    }

                    break;

                    break;

                case MSG_ADD_QS_TILE: {

                case MSG_ADD_QS_TILE: {

                    if (Flags.a11yQsShortcut()) {

                    SomeArgs someArgs = (SomeArgs) msg.obj;

                    SomeArgs someArgs = (SomeArgs) msg.obj;

                    for (int i = 0; i < mCallbacks.size(); i++) {

                    for (int i = 0; i < mCallbacks.size(); i++) {

                        mCallbacks.get(i).addQsTileToFrontOrEnd(

                        mCallbacks.get(i).addQsTileToFrontOrEnd(

                                (ComponentName) someArgs.arg1, (boolean) someArgs.arg2);

                                (ComponentName) someArgs.arg1, (boolean) someArgs.arg2);

                    }

                    }

                    someArgs.recycle();

                    someArgs.recycle();

                    } else {

                        for (int i = 0; i < mCallbacks.size(); i++) {

                            mCallbacks.get(i).addQsTile((ComponentName) msg.obj);

                        }

                    }

                    break;

                    break;

                }

                }

                case MSG_REMOVE_QS_TILE:

                case MSG_REMOVE_QS_TILE: