Merge "Ignore moveTaskToBack transition for PiP" into sc-dev
This commit is contained in:
@@ -7177,8 +7177,11 @@ class Task extends WindowContainer<WindowContainer> {
|
|||||||
if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task="
|
if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task="
|
||||||
+ tr.mTaskId);
|
+ tr.mTaskId);
|
||||||
|
|
||||||
mDisplayContent.prepareAppTransition(TRANSIT_TO_BACK);
|
// Skip the transition for pinned task.
|
||||||
mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_TO_BACK, tr);
|
if (!inPinnedWindowingMode()) {
|
||||||
|
mDisplayContent.prepareAppTransition(TRANSIT_TO_BACK);
|
||||||
|
mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_TO_BACK, tr);
|
||||||
|
}
|
||||||
moveToBack("moveTaskToBackLocked", tr);
|
moveToBack("moveTaskToBackLocked", tr);
|
||||||
|
|
||||||
if (inPinnedWindowingMode()) {
|
if (inPinnedWindowingMode()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user