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

Commit ca3ad825 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Migrate show when lock behavior to handleRequset" into udc-qpr-dev am:... 

Merge "Migrate show when lock behavior to handleRequset" into udc-qpr-dev am: a0e33a38 am: b37216ed

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



Change-Id: Ib27c2a8b8069bb97f621b30c7d18124487f451f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 799db538 b37216ed

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

+13 −11
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.RemoteAnimationTarget.MODE_OPENING;

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static android.view.WindowManager.TRANSIT_CHANGE;

import static android.view.WindowManager.TRANSIT_KEYGUARD_OCCLUDE;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.transitTypeToString;
@@ -1302,20 +1303,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        final boolean mainStageVisible = mMainStage.mRootTaskInfo.isVisible;

        final boolean oneStageVisible =

                mMainStage.mRootTaskInfo.isVisible != mSideStage.mRootTaskInfo.isVisible;

        if (oneStageVisible) {

        if (oneStageVisible && !ENABLE_SHELL_TRANSITIONS) {

            // Dismiss split because there's show-when-locked activity showing on top of keyguard.

            // Also make sure the task contains show-when-locked activity remains on top after split

            // dismissed.

            if (!ENABLE_SHELL_TRANSITIONS) {

            final StageTaskListener toTop = mainStageVisible ? mMainStage : mSideStage;

            exitSplitScreen(toTop, EXIT_REASON_SCREEN_LOCKED_SHOW_ON_TOP);

            } else {

                final int dismissTop = mainStageVisible ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;

                final WindowContainerTransaction wct = new WindowContainerTransaction();

                prepareExitSplitScreen(dismissTop, wct);

                mSplitTransitions.startDismissTransition(wct, this, dismissTop,

                        EXIT_REASON_SCREEN_LOCKED_SHOW_ON_TOP);

            }

        }

    }
@@ -2387,6 +2380,15 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                    // so appends operations to exit split.

                    prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, out);

                }

            } else if (type == TRANSIT_KEYGUARD_OCCLUDE && triggerTask.topActivity != null

                    && isSplitScreenVisible()) {

                // Split include show when lock activity case, check the top activity under which

                // stage and move it to the top.

                int top = triggerTask.topActivity.equals(mMainStage.mRootTaskInfo.topActivity)

                        ? STAGE_TYPE_MAIN : STAGE_TYPE_SIDE;

                prepareExitSplitScreen(top, out);

                mSplitTransitions.setDismissTransition(transition, top,

                        EXIT_REASON_SCREEN_LOCKED_SHOW_ON_TOP);

            }



            // When split in the background, it should be only opening/dismissing transition and