From 1cce85f19757ad72326865f4e036dc5ee949dee2 Mon Sep 17 00:00:00 2001 From: Gustav Sennton Date: Fri, 24 Jan 2025 16:26:05 +0000 Subject: [PATCH] Remove old Desktop transitions flags usages Bug: 369763947 Test: n/a Flag: EXEMPT flags removal Change-Id: Ie4cd157bb94477db83a1995f976c2057f78902e4 --- .../launcher3/QuickstepTransitionManager.java | 3 +-- .../desktop/DesktopAppLaunchTransitionManager.kt | 3 +-- .../taskbar/TaskbarActivityContext.java | 4 +--- .../DesktopAppLaunchTransitionManagerTest.kt | 16 +++------------- 4 files changed, 6 insertions(+), 20 deletions(-) diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index f38693d66b..94bb950072 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -1567,8 +1567,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener private boolean isFreeformAnimation(RemoteAnimationTarget[] appTargets) { return DesktopModeStatus.canEnterDesktopMode(mLauncher.getApplicationContext()) - && (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS.isTrue() - || DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue()) + && DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue() && Arrays.stream(appTargets) .anyMatch(app -> app.taskInfo != null && app.taskInfo.isFreeform()); } diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt index 6cf9b9e962..36c5fbad36 100644 --- a/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt +++ b/quickstep/src/com/android/launcher3/desktop/DesktopAppLaunchTransitionManager.kt @@ -74,8 +74,7 @@ class DesktopAppLaunchTransitionManager( private fun shouldRegisterTransitions(): Boolean = DesktopModeStatus.canEnterDesktopMode(context) && - (DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue || - DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue) + DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue companion object { private fun buildAppLaunchFilter(): TransitionFilter { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index a109a4089f..8a06b114fa 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -1514,9 +1514,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { BubbleTextView.RunningAppState runningAppState = mControllers.taskbarRecentAppsController.getRunningAppState(taskId); return runningAppState == RunningAppState.MINIMIZED - && (DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS.isTrue() - || DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX.isTrue() - ); + && DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX.isTrue(); } private RemoteTransition createDesktopAppLaunchRemoteTransition( diff --git a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt index ae96c09c37..9ca9fe4df5 100644 --- a/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt +++ b/quickstep/tests/src/com/android/quickstep/desktop/DesktopAppLaunchTransitionManagerTest.kt @@ -29,7 +29,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.quickstep.SystemUiProxy -import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.google.common.truth.Truth.assertThat @@ -75,10 +74,7 @@ class DesktopAppLaunchTransitionManagerTest { } @Test - @EnableFlags( - FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS, - FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, - ) + @EnableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) fun registerTransitions_appLaunchFlagEnabled_registersTransition() { transitionManager.registerTransitions() @@ -86,10 +82,7 @@ class DesktopAppLaunchTransitionManagerTest { } @Test - @DisableFlags( - FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS, - FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, - ) + @DisableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) fun registerTransitions_appLaunchFlagDisabled_doesntRegisterTransition() { transitionManager.registerTransitions() @@ -97,10 +90,7 @@ class DesktopAppLaunchTransitionManagerTest { } @Test - @EnableFlags( - FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS, - FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX, - ) + @EnableFlags(FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX) fun registerTransitions_usesCorrectFilter() { transitionManager.registerTransitions() val filterArgumentCaptor = argumentCaptor()