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

Commit 36510511 authored by Jerry Chang's avatar Jerry Chang
Browse files

Polish home-key from split to pip transition 

Includes WINDOWING_MODE_MULTI_WINDOW closing target to the condition of
playing fallback animation. So the remaining splitting task won't be
play with iconview animation when home-key to auto-pip consumed another
splitting task in pip transition handler.

Bug: 281476331
Test: repro steps of the bug
Test: pass existing tests
Video: http://recall/-/fLARJNt42LVxc3tt86SneW/eelqATeE1REoOtOEDxeDVR
Change-Id: If05d8841a6a940e61f71683422ef1a3d4e3597c7
parent d3e37bf0

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+8 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3; 


import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.provider.Settings.Secure.LAUNCHER_TASKBAR_EDUCATION_SHOWING;

import static android.view.RemoteAnimationTarget.MODE_CLOSING;

import static android.view.RemoteAnimationTarget.MODE_OPENING;
@@ -1201,16 +1202,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        return false;

    }



    private boolean hasMultipleTargetsWithMode(RemoteAnimationTarget[] targets, int mode) {

    private boolean shouldPlayFallbackClosingAnimation(RemoteAnimationTarget[] targets) {

        int numTargets = 0;

        for (RemoteAnimationTarget target : targets) {

            if (target.mode == mode) {

            if (target.mode == MODE_CLOSING) {

                numTargets++;

            }

            if (numTargets > 1) {

                if (numTargets > 1 || target.windowConfiguration.getWindowingMode()

                        == WINDOWING_MODE_MULTI_WINDOW) {

                    return true;

                }

            }

        }

        return false;

    }
@@ -1595,7 +1597,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            boolean playFallBackAnimation = (launcherView == null

                    && launcherIsForceInvisibleOrOpening)

                    || mLauncher.getWorkspace().isOverlayShown()

                    || hasMultipleTargetsWithMode(appTargets, MODE_CLOSING);

                    || shouldPlayFallbackClosingAnimation(appTargets);



            boolean playWorkspaceReveal = true;

            boolean skipAllAppsScale = false;