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

Commit 36705e60 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "If hometask is last task to be dismissed, show empty recents instead of... 

Merge "If hometask is last task to be dismissed, show empty recents instead of home screen" into sc-v2-dev
parents 82fc85f9 04309940

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

+7 −2
Original line number Diff line number Diff line
@@ -1335,6 +1335,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
            return;

        }



        mLoadPlanEverApplied = true;

        if (taskGroups == null || taskGroups.isEmpty()) {

            removeTasksViewsAndClearAllButton();

            onTaskStackUpdated();
@@ -1437,7 +1438,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
        resetTaskVisuals();

        onTaskStackUpdated();

        updateEnabledOverlays();

        mLoadPlanEverApplied = true;

    }



    private boolean isModal() {
@@ -3115,12 +3115,17 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T 
                    } else if (dismissedIndex < pageToSnapTo || pageToSnapTo == taskCount - 1) {

                        pageToSnapTo--;

                    }

                    boolean isHomeTaskDismissed = dismissedTaskView == getHomeTaskView();

                    removeViewInLayout(dismissedTaskView);

                    mTopRowIdSet.remove(dismissedTaskViewId);



                    if (taskCount == 1) {

                        removeViewInLayout(mClearAllButton);

                        if (isHomeTaskDismissed) {

                            updateEmptyMessage();

                        } else {

                            startHome();

                        }

                    } else {

                        // Update focus task and its size.

                        if (finalIsFocusedTaskDismissed) {