Merge "If hometask is last task to be dismissed, show empty recents instead of home screen" into sc-v2-dev am: 36705e6039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16273821 Change-Id: I07a1681b8d5ba1a5699537e4f6e5f981ae09718b
This commit is contained in:
@@ -1335,6 +1335,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mLoadPlanEverApplied = true;
|
||||||
if (taskGroups == null || taskGroups.isEmpty()) {
|
if (taskGroups == null || taskGroups.isEmpty()) {
|
||||||
removeTasksViewsAndClearAllButton();
|
removeTasksViewsAndClearAllButton();
|
||||||
onTaskStackUpdated();
|
onTaskStackUpdated();
|
||||||
@@ -1437,7 +1438,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
|||||||
resetTaskVisuals();
|
resetTaskVisuals();
|
||||||
onTaskStackUpdated();
|
onTaskStackUpdated();
|
||||||
updateEnabledOverlays();
|
updateEnabledOverlays();
|
||||||
mLoadPlanEverApplied = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isModal() {
|
private boolean isModal() {
|
||||||
@@ -3115,12 +3115,17 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
|||||||
} else if (dismissedIndex < pageToSnapTo || pageToSnapTo == taskCount - 1) {
|
} else if (dismissedIndex < pageToSnapTo || pageToSnapTo == taskCount - 1) {
|
||||||
pageToSnapTo--;
|
pageToSnapTo--;
|
||||||
}
|
}
|
||||||
|
boolean isHomeTaskDismissed = dismissedTaskView == getHomeTaskView();
|
||||||
removeViewInLayout(dismissedTaskView);
|
removeViewInLayout(dismissedTaskView);
|
||||||
mTopRowIdSet.remove(dismissedTaskViewId);
|
mTopRowIdSet.remove(dismissedTaskViewId);
|
||||||
|
|
||||||
if (taskCount == 1) {
|
if (taskCount == 1) {
|
||||||
removeViewInLayout(mClearAllButton);
|
removeViewInLayout(mClearAllButton);
|
||||||
startHome();
|
if (isHomeTaskDismissed) {
|
||||||
|
updateEmptyMessage();
|
||||||
|
} else {
|
||||||
|
startHome();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// Update focus task and its size.
|
// Update focus task and its size.
|
||||||
if (finalIsFocusedTaskDismissed) {
|
if (finalIsFocusedTaskDismissed) {
|
||||||
|
|||||||
Reference in New Issue
Block a user