From 51943297be3f5f1703b7e09cc6c8c1f7ffda0250 Mon Sep 17 00:00:00 2001 From: Will Osborn Date: Thu, 24 Apr 2025 13:27:28 +0000 Subject: [PATCH] No recents-in-window on default display if enableOverviewOnConnectedDisplays is true Bug: 413257766 Flag: com.android.launcher3.enable_overview_on_connected_displays Test: local + presubmit Change-Id: I0ae36d4bec4cf962e4c71304c82838dbf2bf518f --- .../taskbar/LauncherTaskbarUIController.java | 12 ++++++----- .../TaskbarLauncherStateController.java | 19 +++++++++--------- .../launcher3/taskbar/TaskbarManagerImpl.java | 11 +++++----- .../android/quickstep/AbsSwipeUpHandler.java | 5 +++-- .../com/android/quickstep/GestureState.java | 4 ++-- .../android/quickstep/InputConsumerUtils.kt | 9 ++++----- .../quickstep/OverviewCommandHelper.kt | 20 ++++++++++--------- .../quickstep/RecentsAnimationCallbacks.java | 11 +++++----- .../quickstep/TaskAnimationManager.java | 7 +++---- .../fallback/FallbackRecentsView.java | 14 ++++++------- .../quickstep/util/RecentsOrientedState.java | 8 +++----- .../util/SplitSelectStateController.java | 3 +-- .../SplitWithKeyboardShortcutController.java | 2 +- .../android/quickstep/views/RecentsView.java | 11 ++++------ 14 files changed, 66 insertions(+), 70 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java index 5d1884c5b9..639eb4823d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java @@ -48,13 +48,13 @@ import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.MultiPropertyFactory; import com.android.launcher3.util.OnboardingPrefs; +import com.android.quickstep.BaseContainerInterface; import com.android.quickstep.GestureState; import com.android.quickstep.HomeVisibilityState; import com.android.quickstep.LauncherActivityInterface; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationCallbacks; import com.android.quickstep.SystemUiProxy; -import com.android.quickstep.fallback.window.RecentsWindowFlags; -import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.SplitTask; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; @@ -120,9 +120,11 @@ public class LauncherTaskbarUIController extends TaskbarUIController { mTaskbarLauncherStateController.init(mControllers, mLauncher, mControllers.getSharedState().sysuiStateFlags); final TaskbarActivityContext taskbarContext = mControllers.taskbarActivityContext; - if (RecentsWindowFlags.getEnableOverviewInWindow()) { - mRecentsViewContainer = RecentsWindowManager.REPOSITORY_INSTANCE.get( - taskbarContext).get(taskbarContext.getDisplayId()); + int displayId = taskbarContext.getDisplayId(); + BaseContainerInterface containerInterface = OverviewComponentObserver.INSTANCE.get( + taskbarContext).getContainerInterface(displayId); + if (containerInterface != null) { + mRecentsViewContainer = containerInterface.getCreatedContainer(); } if (mRecentsViewContainer == null) { mRecentsViewContainer = mLauncher; diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java index a97893f75a..08ff2ec6e2 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java @@ -62,10 +62,11 @@ import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.taskbar.bubbles.stashing.BubbleStashController.BubbleLauncherState; import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.util.MultiPropertyFactory.MultiProperty; +import com.android.quickstep.BaseContainerInterface; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsAnimationCallbacks; import com.android.quickstep.RecentsAnimationController; import com.android.quickstep.fallback.RecentsState; -import com.android.quickstep.fallback.window.RecentsWindowFlags; import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ScalingWorkspaceRevealAnim; import com.android.quickstep.util.SystemUiFlagUtils; @@ -1141,14 +1142,14 @@ public class TaskbarLauncherStateController { * Helper function to run a callback on the RecentsWindowManager (if it exists). */ private void runForRecentsWindowManager(Consumer callback) { - if (RecentsWindowFlags.getEnableOverviewInWindow()) { - final TaskbarActivityContext taskbarContext = mControllers.taskbarActivityContext; - RecentsWindowManager recentsWindowManager = - RecentsWindowManager.REPOSITORY_INSTANCE.get(taskbarContext).get( - taskbarContext.getDisplayId()); - if (recentsWindowManager != null) { - callback.accept(recentsWindowManager); - } + final TaskbarActivityContext taskbarContext = mControllers.taskbarActivityContext; + int displayId = taskbarContext.getDisplayId(); + BaseContainerInterface containerInterface = OverviewComponentObserver.INSTANCE.get( + taskbarContext).getContainerInterface(displayId); + if (containerInterface != null + && containerInterface.getCreatedContainer() instanceof RecentsWindowManager + recentsWindowManager) { + callback.accept(recentsWindowManager); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java index 225b29d796..6b622d16a7 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManagerImpl.java @@ -89,11 +89,11 @@ import com.android.launcher3.util.LooperExecutor; import com.android.launcher3.util.SettingsCache; import com.android.launcher3.util.SimpleBroadcastReceiver; import com.android.quickstep.AllAppsActionManager; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RecentsActivity; import com.android.quickstep.SystemDecorationChangeObserver; import com.android.quickstep.SystemDecorationChangeObserver.DisplayDecorationListener; import com.android.quickstep.SystemUiProxy; -import com.android.quickstep.fallback.window.RecentsWindowFlags; import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ContextualSearchInvoker; import com.android.quickstep.util.GroupTask; @@ -730,11 +730,10 @@ public class TaskbarManagerImpl implements DisplayDecorationListener { /** Creates a {@link TaskbarUIController} to use with non default displays. */ private TaskbarUIController createTaskbarUIControllerForNonDefaultDisplay(int displayId) { debugPrimaryTaskbar("createTaskbarUIControllerForNonDefaultDisplay"); - if (RecentsWindowFlags.getEnableOverviewInWindow()) { - RecentsViewContainer rvc = mRecentsWindowManagerRepository.get(displayId); - if (rvc != null) { - return createTaskbarUIControllerForRecentsViewContainer(rvc); - } + RecentsViewContainer rvc = OverviewComponentObserver.INSTANCE.get( + mBaseContext).getContainerInterface(displayId).getCreatedContainer(); + if (rvc != null) { + return createTaskbarUIControllerForRecentsViewContainer(rvc); } return new TaskbarUIController(); diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index a1fc0b57df..6272cd583b 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -135,7 +135,7 @@ import com.android.launcher3.util.VibratorWrapper; import com.android.launcher3.util.WindowBounds; import com.android.quickstep.GestureState.GestureEndTarget; import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle; -import com.android.quickstep.fallback.window.RecentsWindowFlags; +import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; import com.android.quickstep.util.ActiveGestureProtoLogProxy; @@ -905,7 +905,8 @@ public abstract class AbsSwipeUpHandler< public Intent getLaunchIntent() { // todo differentiate intent based on if we are on home or in app for overview in window - boolean useHomeIntentForWindow = RecentsWindowFlags.getEnableOverviewInWindow(); + boolean useHomeIntentForWindow = + mContainerInterface.getCreatedContainer() instanceof RecentsWindowManager; return useHomeIntentForWindow ? getHomeIntent() : mGestureState.getOverviewIntent(); } /** diff --git a/quickstep/src/com/android/quickstep/GestureState.java b/quickstep/src/com/android/quickstep/GestureState.java index e5a97043eb..2492ac3aa8 100644 --- a/quickstep/src/com/android/quickstep/GestureState.java +++ b/quickstep/src/com/android/quickstep/GestureState.java @@ -41,7 +41,7 @@ import androidx.annotation.Nullable; import com.android.launcher3.statemanager.BaseState; import com.android.launcher3.statemanager.StatefulContainer; import com.android.quickstep.TopTaskTracker.CachedTaskInfo; -import com.android.quickstep.fallback.window.RecentsWindowFlags; +import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ActiveGestureErrorDetector; import com.android.quickstep.util.ActiveGestureLog; import com.android.quickstep.util.ActiveGestureProtoLogProxy; @@ -323,7 +323,7 @@ public class GestureState implements RecentsAnimationCallbacks.RecentsAnimationL */ public boolean useSyntheticRecentsTransition() { return mRunningTask.isHomeTask() - && RecentsWindowFlags.getEnableOverviewInWindow(); + && mContainerInterface.getCreatedContainer() instanceof RecentsWindowManager; } /** diff --git a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt index 9cd19f84dc..272faf2831 100644 --- a/quickstep/src/com/android/quickstep/InputConsumerUtils.kt +++ b/quickstep/src/com/android/quickstep/InputConsumerUtils.kt @@ -23,7 +23,7 @@ import com.android.launcher3.statemanager.BaseState import com.android.launcher3.statemanager.StatefulContainer import com.android.launcher3.taskbar.TaskbarManager import com.android.launcher3.util.LockedUserState.Companion.get -import com.android.quickstep.fallback.window.RecentsWindowFlags +import com.android.quickstep.fallback.window.RecentsWindowManager import com.android.quickstep.inputconsumers.AccessibilityInputConsumer import com.android.quickstep.inputconsumers.AssistantInputConsumer import com.android.quickstep.inputconsumers.BubbleBarInputConsumer @@ -806,14 +806,13 @@ object InputConsumerUtils { isHomeTask: Boolean, rotationTouchHelper: RotationTouchHelper, ): InputConsumer where T : RecentsViewContainer, T : StatefulContainer { + val containerInterface = gestureState.getContainerInterface() val shouldDefer = (!overviewComponentObserver.isHomeAndOverviewSame || - gestureState - .getContainerInterface() - .deferStartingActivity(deviceState, event)) + containerInterface.deferStartingActivity(deviceState, event)) val disableHorizontalSwipe = deviceState.isInExclusionRegion(event) && - (!RecentsWindowFlags.enableOverviewInWindow || !isHomeTask) + (containerInterface.getCreatedContainer() !is RecentsWindowManager || !isHomeTask) return OtherActivityInputConsumer( /* base= */ context, deviceState, diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt index 058f3e9b76..8a1e37d5d4 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.kt @@ -52,7 +52,7 @@ import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW_ALT_TAB import com.android.quickstep.OverviewCommandHelper.CommandType.SHOW_WITH_FOCUS import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE import com.android.quickstep.OverviewCommandHelper.CommandType.TOGGLE_OVERVIEW_PREVIOUS -import com.android.quickstep.fallback.window.RecentsWindowFlags.enableOverviewInWindow +import com.android.quickstep.fallback.window.RecentsWindowManager import com.android.quickstep.util.ActiveGestureLog import com.android.quickstep.util.ActiveGestureProtoLogProxy import com.android.quickstep.views.RecentsView @@ -345,10 +345,12 @@ constructor( val recentsView: RecentsView<*, *>? = recentsViewContainer?.getOverviewPanel() val deviceProfile = recentsViewContainer?.getDeviceProfile() val taskbarUIController: TaskbarUIController? = - if (command.displayId != DEFAULT_DISPLAY && !enableOverviewInWindow) { - // When enableOverviewInWindow is false, getContainerInterface can only return - // BaseContainerInterface of DEFAULT_DISPLAY. Getting TaskbarUiController from - // TaskbarManager as a workaround. + if ( + command.displayId != DEFAULT_DISPLAY && + recentsViewContainer !is RecentsWindowManager + ) { + // When recentsViewContainer is not RecentsWindowManager, get TaskbarUiController + // from TaskbarManager as a workaround. taskbarManager.getUIControllerForDisplay(command.displayId) } else { containerInterface.getTaskbarController() @@ -432,8 +434,8 @@ constructor( // If we get here then launcher is not the top visible task, so we should animate // that task. - if (!enableOverviewInWindow) { - containerInterface.getCreatedContainer()?.rootView?.let { view -> + if (recentsViewContainer !is RecentsWindowManager) { + recentsViewContainer?.rootView?.let { view -> InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_QUICK_SWITCH) } } @@ -468,8 +470,8 @@ constructor( transitionInfo: TransitionInfo?, ) { Log.d(TAG, "recents animation started: $command") - if (enableOverviewInWindow) { - containerInterface.getCreatedContainer()?.rootView?.let { view -> + if (recentsViewContainer is RecentsWindowManager) { + recentsViewContainer.rootView?.let { view -> InteractionJankMonitorWrapper.begin(view, Cuj.CUJ_LAUNCHER_QUICK_SWITCH) } } diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java index 1cdaa184d7..532530a287 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java @@ -36,8 +36,9 @@ import androidx.annotation.UiThread; import com.android.launcher3.Utilities; import com.android.launcher3.util.Preconditions; -import com.android.quickstep.fallback.window.RecentsWindowFlags; +import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ActiveGestureProtoLogProxy; +import com.android.quickstep.views.RecentsViewContainer; import com.android.systemui.shared.recents.model.ThumbnailData; import com.android.systemui.shared.system.RecentsAnimationControllerCompat; @@ -55,15 +56,15 @@ public class RecentsAnimationCallbacks implements com.android.systemui.shared.system.RecentsAnimationListener { private final Set mListeners = new ArraySet<>(); - private final SystemUiProxy mSystemUiProxy; + private final RecentsViewContainer mContainer; // TODO(141886704): Remove these references when they are no longer needed private RecentsAnimationController mController; private boolean mCancelled; - public RecentsAnimationCallbacks(SystemUiProxy systemUiProxy) { - mSystemUiProxy = systemUiProxy; + public RecentsAnimationCallbacks(RecentsViewContainer container) { + mContainer = container; } @UiThread @@ -113,7 +114,7 @@ public class RecentsAnimationCallbacks implements boolean isOpeningHome = Arrays.stream(appTargets).filter(app -> app.mode == MODE_OPENING && app.windowConfiguration.getActivityType() == ACTIVITY_TYPE_HOME) .count() > 0; - if (appCount == 0 && (!RecentsWindowFlags.getEnableOverviewInWindow() + if (appCount == 0 && (!(mContainer instanceof RecentsWindowManager) || isOpeningHome)) { ActiveGestureProtoLogProxy.logOnRecentsAnimationStartCancelled(); // Edge case, if there are no closing app targets, then Launcher has nothing to handle diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index 85a7cd7a1f..34c079eddd 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -49,7 +49,6 @@ import com.android.launcher3.taskbar.TaskbarUIController; import com.android.launcher3.util.DaggerSingletonObject; import com.android.launcher3.util.DisplayController; import com.android.quickstep.dagger.QuickstepBaseAppComponent; -import com.android.quickstep.fallback.window.RecentsWindowFlags; import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.ActiveGestureProtoLogProxy; import com.android.quickstep.util.SystemUiFlagUtils; @@ -176,7 +175,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn final BaseContainerInterface containerInterface = gestureState.getContainerInterface(); mLastGestureState = gestureState; - RecentsAnimationCallbacks newCallbacks = new RecentsAnimationCallbacks(getSystemUiProxy()); + RecentsAnimationCallbacks newCallbacks = new RecentsAnimationCallbacks( + containerInterface.getCreatedContainer()); mCallbacks = newCallbacks; mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { @Override @@ -339,8 +339,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn } if (containerInterface.getCreatedContainer() - instanceof RecentsWindowManager recentsWindowManager - && RecentsWindowFlags.getEnableOverviewInWindow()) { + instanceof RecentsWindowManager recentsWindowManager) { mRecentsAnimationStartPending = getSystemUiProxy().startRecentsActivity(intent, options, mCallbacks, gestureState.useSyntheticRecentsTransition(), null, mDisplayId); recentsWindowManager.startRecentsWindow(mCallbacks); diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java index 117c739952..d5c187fbbc 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java @@ -42,11 +42,10 @@ import com.android.launcher3.statemanager.StatefulContainer; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; import com.android.quickstep.BaseContainerInterface; -import com.android.quickstep.FallbackActivityInterface; -import com.android.quickstep.FallbackWindowInterface; import com.android.quickstep.GestureState; +import com.android.quickstep.OverviewComponentObserver; import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle; -import com.android.quickstep.fallback.window.RecentsWindowFlags; +import com.android.quickstep.fallback.window.RecentsWindowManager; import com.android.quickstep.util.GroupTask; import com.android.quickstep.util.SingleTask; import com.android.quickstep.util.SplitSelectStateController; @@ -82,16 +81,15 @@ public class FallbackRecentsView getContainerInterface(int displayId) { - return RecentsWindowFlags.getEnableOverviewInWindow() - ? FallbackWindowInterface.REPOSITORY_INSTANCE.get(mContext).get(displayId) - : FallbackActivityInterface.INSTANCE; + return (BaseContainerInterface) OverviewComponentObserver.INSTANCE.get( + mContext).getContainerInterface(displayId); } @Override public void init(OverviewActionsView actionsView, SplitSelectStateController splitController, @Nullable DesktopRecentsTransitionController desktopRecentsTransitionController) { super.init(actionsView, splitController, desktopRecentsTransitionController); - if (RecentsWindowFlags.getEnableOverviewInWindow()) { + if (mContainer instanceof RecentsWindowManager) { // These will be set during the state transition to DEFAULT return; } @@ -309,7 +307,7 @@ public class FallbackRecentsView { final TransformParams params = remoteTargetHandle.getTransformParams(); - if (RecentsWindowFlags.getEnableOverviewInWindow()) { + if (mContainer instanceof RecentsWindowManager manager) { params.setHomeBuilderProxy((builder, app, transformParams) -> { mTmpMatrix.setScale( 1f, 1f, app.localBounds.exactCenterX(), app.localBounds.exactCenterY());