Merge "Merge "Fix toucn unresponsive after half fold in split" into sc-v2-dev am: 07a5dd0cb2 am: e74a59047b"

This commit is contained in:
Automerger Merge Worker
2022-01-05 02:39:46 +00:00
committed by Android (Google) Code Review

View File

@@ -105,6 +105,9 @@ public class StageTaskUnfoldController implements UnfoldListener, OnInsetsChange
* @param leash surface leash for the appeared task
*/
public void onTaskAppeared(ActivityManager.RunningTaskInfo taskInfo, SurfaceControl leash) {
// Only handle child task surface here.
if (!taskInfo.hasParentTask()) return;
AnimationContext context = new AnimationContext(leash);
mAnimationContextByTaskId.put(taskInfo.taskId, context);
}
@@ -114,6 +117,8 @@ public class StageTaskUnfoldController implements UnfoldListener, OnInsetsChange
* @param taskInfo info for the vanished task
*/
public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) {
if (!taskInfo.hasParentTask()) return;
AnimationContext context = mAnimationContextByTaskId.get(taskInfo.taskId);
if (context != null) {
final SurfaceControl.Transaction transaction = mTransactionPool.acquire();