Merge "Fix TaskView bind and orientation state called multiple times" into udc-qpr-dev am: 135adf3d90

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

Change-Id: Idaa36818bf492882b029d3cc690cca3010ae5423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jordan Silva
2023-05-25 00:03:27 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 2 deletions
@@ -1631,6 +1631,10 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
int[] runningTaskId = getTaskIdsForTaskViewId(mRunningTaskViewId);
int[] focusedTaskId = getTaskIdsForTaskViewId(mFocusedTaskViewId);
// Reset the focused task to avoiding initializing TaskViews layout as focused task during
// binding. The focused task view will be updated after all the TaskViews are bound.
mFocusedTaskViewId = INVALID_TASK_ID;
// Removing views sets the currentPage to 0, so we save this and restore it after
// the new set of views are added
int previousCurrentPage = mCurrentPage;
@@ -1737,7 +1741,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mFocusedTaskViewId = newFocusedTaskView != null && !ENABLE_GRID_ONLY_OVERVIEW.get()
? newFocusedTaskView.getTaskViewId() : INVALID_TASK_ID;
updateTaskSize();
updateChildTaskOrientations();
if (newFocusedTaskView != null) {
newFocusedTaskView.setOrientationState(mOrientationState);
}
TaskView newRunningTaskView = null;
if (hasAnyValidTaskIds(runningTaskId)) {
@@ -580,7 +580,6 @@ public class TaskView extends FrameLayout implements Reusable {
mIconView, STAGE_POSITION_UNDEFINED);
mSnapshotView.bind(task);
setOrientationState(orientedState);
mDigitalWellBeingToast.initialize(mTask);
}
/**