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

Commit 87d546e9 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Prevent empty recents going home when splitting with taskbar present"... 

Merge "Prevent empty recents going home when splitting with taskbar present" into tm-qpr-dev am: dba5a396

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545270



Change-Id: Id8f6f8c23515fa95ca58a395f8536e5efedd3df7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08c4290d dba5a396

quickstep/src/com/android/quickstep/views/RecentsView.java

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR; 
import static com.android.launcher3.anim.Interpolators.OVERSHOOT_0_75;

import static com.android.launcher3.anim.Interpolators.clampToProgress;

import static com.android.launcher3.config.FeatureFlags.ENABLE_LAUNCH_FROM_STAGED_APP;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_OVERVIEW_ACTIONS_SPLIT;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_CLEAR_ALL;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASK_DISMISS_SWIPE_UP;
@@ -3476,7 +3477,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                        removeViewInLayout(mClearAllButton);

                        if (isHomeTaskDismissed) {

                            updateEmptyMessage();

                        } else {

                        } else if (!(ENABLE_TASKBAR_IN_OVERVIEW.get() &&

                                mSplitSelectStateController.isSplitSelectActive())) {

                            startHome();

                        }

                    } else {