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

Commit 7abf66be authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix split to pip with home-key not dismissing split properly" into... 

Merge "Fix split to pip with home-key not dismissing split properly" into udc-dev am: bb5a8af4 am: 7ffd9a53

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23599962



Change-Id: Ied1061d0034daff67dd0d72ae3d76be237683af3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08c7080c 7ffd9a53

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

+10 −11
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static android.app.ComponentOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVIT 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.content.res.Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.RemoteAnimationTarget.MODE_OPENING;
@@ -2835,19 +2834,19 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            }

        }



        mRecentTasks.ifPresent(recentTasks -> {

        if (shouldBreakPairedTaskInRecents(dismissReason)) {

            // Notify recents if we are exiting in a way that breaks the pair, and disable further

            // updates to splits in the recents until we enter split again

            if (shouldBreakPairedTaskInRecents(dismissReason)) {

                    for (TransitionInfo.Change change : info.getChanges()) {

            mRecentTasks.ifPresent(recentTasks -> {

                for (int i = info.getChanges().size() - 1; i >= 0; --i) {

                    final TransitionInfo.Change change = info.getChanges().get(i);

                    final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo();

                        if (taskInfo != null

                                && taskInfo.getWindowingMode() != WINDOWING_MODE_MULTI_WINDOW) {

                    if (taskInfo != null && getStageOfTask(taskInfo) != null) {

                        recentTasks.removeSplitPair(taskInfo.taskId);

                    }

                }

            }

            });

        }

        mSplitRequest = null;



        // Update local states.

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+14 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.view.WindowManager.TRANSIT_TO_BACK; 
import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;



import static com.android.wm.shell.common.split.SplitScreenConstants.FLAG_IS_DIVIDER_BAR;

import static com.android.wm.shell.common.split.SplitScreenConstants.SPLIT_POSITION_UNDEFINED;

import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED;

import static com.android.wm.shell.splitscreen.SplitScreenController.EXIT_REASON_CHILD_TASK_ENTER_PIP;

import static com.android.wm.shell.util.TransitionUtil.isOpeningType;
@@ -340,6 +341,19 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
            return animateOpenIntentWithRemoteAndPip(mixed, info, startTransaction,

                    finishTransaction, finishCallback);

        } else if (mixed.mType == MixedTransition.TYPE_RECENTS_DURING_SPLIT) {

            for (int i = info.getChanges().size() - 1; i >= 0; --i) {

                final TransitionInfo.Change change = info.getChanges().get(i);

                // Pip auto-entering info might be appended to recent transition like pressing

                // home-key in 3-button navigation. This offers split handler the opportunity to

                // handle split to pip animation.

                if (mPipHandler.isEnteringPip(change, info.getType())

                        && mSplitHandler.getSplitItemPosition(change.getLastParent())

                        != SPLIT_POSITION_UNDEFINED) {

                    return animateEnterPipFromSplit(mixed, info, startTransaction,

                            finishTransaction, finishCallback);

                }

            }



            return animateRecentsDuringSplit(mixed, info, startTransaction, finishTransaction,

                    finishCallback);

        } else if (mixed.mType == MixedTransition.TYPE_KEYGUARD) {