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

Commit 49b9fbd1 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Polish home-key from split to pip transition" into udc-dev am: ca08d75e am: 93551e94 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23833485



Change-Id: I0a6ef4eee4dfc6244b5ee4a7716c1e625923d4b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96fc36f6 93551e94

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;
@@ -1210,16 +1211,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;

    }
@@ -1604,7 +1606,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;