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

Commit 557303d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't add StageChangeRecord when stage task moves to back" into main

parents a9160326 03c1e23c

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.RemoteAnimationTarget.MODE_OPENING;

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_CLOSE;

import static android.view.WindowManager.TRANSIT_KEYGUARD_OCCLUDE;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;
@@ -2671,7 +2672,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                                + " with " + taskInfo.taskId + " before startAnimation().");

                        record.addRecord(stage, true, taskInfo.taskId);

                    }

                } else if (isClosingType(change.getMode())) {

                } else if (change.getMode() == TRANSIT_CLOSE) {

                    if (stage.containsTask(taskInfo.taskId)) {

                        record.addRecord(stage, false, taskInfo.taskId);

                        Log.w(TAG, "Expected onTaskVanished on " + stage + " to have been called"