Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't prematurely apply finishT in taskview handler" into udc-dev

Browse Source
This commit is contained in:
Evan Rosky
2023-05-08 01:44:23 +00:00
committed by Android (Google) Code Review
parent 0a141fd6fa 2bff4a96cf
commit 3d8774d28f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTaskController.java
View File

@@ -453,7 +453,7 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
return; return;
} }
finishTransaction.reparent(mTaskLeash, null).apply(); finishTransaction.reparent(mTaskLeash, null);
if (mListener != null) { if (mListener != null) {
final int taskId = mTaskInfo.taskId; final int taskId = mTaskInfo.taskId;
@@ -490,13 +490,11 @@ public class TaskViewTaskController implements ShellTaskOrganizer.TaskListener {
if (mSurfaceCreated) { if (mSurfaceCreated) {
// Surface is ready, so just reparent the task to this surface control // Surface is ready, so just reparent the task to this surface control
startTransaction.reparent(mTaskLeash, mSurfaceControl) startTransaction.reparent(mTaskLeash, mSurfaceControl)
.show(mTaskLeash) .show(mTaskLeash);
.apply();
// Also reparent on finishTransaction since the finishTransaction will reparent back // Also reparent on finishTransaction since the finishTransaction will reparent back
// to its "original" parent by default. // to its "original" parent by default.
finishTransaction.reparent(mTaskLeash, mSurfaceControl) finishTransaction.reparent(mTaskLeash, mSurfaceControl)
.setPosition(mTaskLeash, 0, 0) .setPosition(mTaskLeash, 0, 0);
.apply();
mTaskViewTransitions.updateBoundsState(this, mTaskViewBase.getCurrentBoundsOnScreen()); mTaskViewTransitions.updateBoundsState(this, mTaskViewBase.getCurrentBoundsOnScreen());
mTaskViewTransitions.updateVisibilityState(this, true /* visible */); mTaskViewTransitions.updateVisibilityState(this, true /* visible */);
wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen()); wct.setBounds(mTaskToken, mTaskViewBase.getCurrentBoundsOnScreen());

4
libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java
View File

@@ -363,7 +363,8 @@ public class TaskViewTransitions implements Transitions.TransitionHandler {
continue; continue;
} }
startTransaction.reparent(chg.getLeash(), tv.getSurfaceControl()); startTransaction.reparent(chg.getLeash(), tv.getSurfaceControl());
finishTransaction.reparent(chg.getLeash(), tv.getSurfaceControl()); finishTransaction.reparent(chg.getLeash(), tv.getSurfaceControl())
.setPosition(chg.getLeash(), 0, 0);
changesHandled++; changesHandled++;
} }
} }
@@ -377,7 +378,6 @@ public class TaskViewTransitions implements Transitions.TransitionHandler {
} }
// No animation, just show it immediately. // No animation, just show it immediately.
startTransaction.apply(); startTransaction.apply();
finishTransaction.apply();
finishCallback.onTransitionFinished(wct, null /* wctCB */); finishCallback.onTransitionFinished(wct, null /* wctCB */);
startNextTransition(); startNextTransition();
return true; return true;