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

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

Merge "Fix not clearing split pair record after auto-enter pip" into udc-dev... 

Merge "Fix not clearing split pair record after auto-enter pip" into udc-dev am: f64b22f7 am: af15f9a5

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



Change-Id: I845eb2c0cb151961451c99896a7dbeb050fb00cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 033419f8 af15f9a5

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

+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 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;
@@ -2377,6 +2378,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                            + " so make sure split-screen state is cleaned-up. "

                            + "mainStageCount=%d sideStageCount=%d", mMainStage.getChildCount(),

                    mSideStage.getChildCount());

            if (triggerTask != null) {

                mRecentTasks.ifPresent(

                        recentTasks -> recentTasks.removeSplitPair(triggerTask.taskId));

            }

            prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, outWCT);

        }

    }
@@ -2757,7 +2762,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    for (TransitionInfo.Change change : info.getChanges()) {

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

                        if (taskInfo != null

                                && taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {

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

                            recentTasks.removeSplitPair(taskInfo.taskId);

                        }

                    }