diff options
| -rw-r--r-- | packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/CommandQueueTest.java | 32 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java | 37 |
2 files changed, 14 insertions, 55 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/CommandQueueTest.java index 2020d0dcb041..7eb5c75a78ae 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -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.WindowInsetsController.BEHAVIOR_DEFAULT; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -35,14 +35,12 @@ import android.hardware.biometrics.IBiometricSysuiReceiver; import android.hardware.biometrics.PromptInfo; import android.hardware.fingerprint.IUdfpsRefreshRateRequestCallback; import android.os.Bundle; -import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.view.KeyEvent; import android.view.WindowInsets; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; -import android.view.accessibility.Flags; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; @@ -385,30 +383,7 @@ public class CommandQueueTest extends SysuiTestCase { } @Test - @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT) - 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() { + public void addQsTile() { ComponentName c = new ComponentName("testpkg", "testcls"); mCommandQueue.addQsTile(c); @@ -418,8 +393,7 @@ public class CommandQueueTest extends SysuiTestCase { } @Test - @EnableFlags(Flags.FLAG_A11Y_QS_SHORTCUT) - public void addQsTileAtTheEnd_withA11yQsShortcutFlagOn() { + public void addQsTileAtTheEnd() { ComponentName c = new ComponentName("testpkg", "testcls"); mCommandQueue.addQsTileToFrontOrEnd(c, true); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java index c6a4d15705f0..8f8c2a38f41f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java @@ -58,7 +58,6 @@ import android.view.KeyEvent; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; -import android.view.accessibility.Flags; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; @@ -980,13 +979,7 @@ public class CommandQueue extends IStatusBar.Stub implements @Override public void addQsTile(ComponentName tile) { - if (Flags.a11yQsShortcut()) { - addQsTileToFrontOrEnd(tile, false); - } else { - synchronized (mLock) { - mHandler.obtainMessage(MSG_ADD_QS_TILE, tile).sendToTarget(); - } - } + addQsTileToFrontOrEnd(tile, false); } /** @@ -996,13 +989,11 @@ public class CommandQueue extends IStatusBar.Stub implements */ @Override public void addQsTileToFrontOrEnd(ComponentName tile, boolean end) { - if (Flags.a11yQsShortcut()) { - synchronized (mLock) { - SomeArgs args = SomeArgs.obtain(); - args.arg1 = tile; - args.arg2 = end; - mHandler.obtainMessage(MSG_ADD_QS_TILE, args).sendToTarget(); - } + synchronized (mLock) { + SomeArgs args = SomeArgs.obtain(); + args.arg1 = tile; + args.arg2 = end; + mHandler.obtainMessage(MSG_ADD_QS_TILE, args).sendToTarget(); } } @@ -1676,18 +1667,12 @@ public class CommandQueue extends IStatusBar.Stub implements } break; case MSG_ADD_QS_TILE: { - if (Flags.a11yQsShortcut()) { - SomeArgs someArgs = (SomeArgs) msg.obj; - for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).addQsTileToFrontOrEnd( - (ComponentName) someArgs.arg1, (boolean) someArgs.arg2); - } - someArgs.recycle(); - } else { - for (int i = 0; i < mCallbacks.size(); i++) { - mCallbacks.get(i).addQsTile((ComponentName) msg.obj); - } + SomeArgs someArgs = (SomeArgs) msg.obj; + for (int i = 0; i < mCallbacks.size(); i++) { + mCallbacks.get(i).addQsTileToFrontOrEnd( + (ComponentName) someArgs.arg1, (boolean) someArgs.arg2); } + someArgs.recycle(); break; } case MSG_REMOVE_QS_TILE: |