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

Commit d64e3231 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Allow TRANSIT_TO_FRONT to enter PiP if needed 

Make sure TO_FRONT transitions with a task change
in WINDOWING_MODE_PINNED are resolved as enter PiP
transitions to be handled by PipTransition handler.

Bug: 308054074
Test: use ag/26668330 CP to test for breakage fix
  (instructions provided in that same WIP CL as well)
Change-Id: I5eda8d4a0e88428025c1151b06d8e6f337526ee7
(cherry picked from commit 07711a6c)
parent 6b003be2

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+6 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.view.WindowManager.TRANSIT_CHANGE; 
import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_PIP;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.transitTypeToString;

import static android.window.TransitionInfo.FLAG_IS_DISPLAY;
@@ -840,8 +841,11 @@ public class PipTransition extends PipTransitionController { 
                && change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED

                && !change.getContainer().equals(mCurrentPipTaskToken)) {

            // We support TRANSIT_PIP type (from RootWindowContainer) or TRANSIT_OPEN (from apps

            // that enter PiP instantly on opening, mostly from CTS/Flicker tests)

            if (transitType == TRANSIT_PIP || transitType == TRANSIT_OPEN) {

            // that enter PiP instantly on opening, mostly from CTS/Flicker tests).

            // TRANSIT_TO_FRONT, though uncommon with triggering PiP, should semantically also

            // be allowed to animate if the task in question is pinned already - see b/308054074.

            if (transitType == TRANSIT_PIP || transitType == TRANSIT_OPEN

                    || transitType == TRANSIT_TO_FRONT) {

                return true;

            }

            // This can happen if the request to enter PIP happens when we are collecting for