diff options
Diffstat (limited to 'quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java')
| -rw-r--r-- | quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java index 074aedd3c7..95d88cd935 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java @@ -35,6 +35,7 @@ import androidx.annotation.Nullable; import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.anim.PendingAnimation; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.statemanager.StateManager.StateListener; import com.android.launcher3.util.SplitConfigurationOptions; @@ -79,11 +80,16 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta } @Override - public void startHome(boolean animated) { + protected void handleStartHome(boolean animated) { mActivity.startHome(); AbstractFloatingView.closeAllOpenViews(mActivity, mActivity.isStarted()); } + @Override + protected boolean canStartHomeSafely() { + return mActivity.canStartHomeSafely(); + } + /** * When starting gesture interaction from home, we add a temporary invisible tile corresponding * to the home task. This allows us to handle quick-switch similarly to a quick-switching @@ -246,7 +252,11 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta setOverviewSelectEnabled(false); } if (finalState != OVERVIEW_SPLIT_SELECT) { - resetFromSplitSelectionState(); + if (FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()) { + mSplitSelectStateController.resetState(); + } else { + resetFromSplitSelectionState(); + } } if (isOverlayEnabled) { |