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

Commit eeb25080 authored by Graciela Putri's avatar Graciela Putri Committed by Automerger Merge Worker
Browse files

Merge "StageCoordinator shouldn't support CompatUI" into udc-qpr-dev am: 93dddb4a 

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



Change-Id: I1cc624d37c465e8bab758a8f8cb16052e3847975
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 10dc16e9 93dddb4a

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ public class ShellTaskOrganizer extends TaskOrganizer implements 
        default void onBackPressedOnTaskRoot(RunningTaskInfo taskInfo) {}

        default void onBackPressedOnTaskRoot(RunningTaskInfo taskInfo) {}

        /** Whether this task listener supports compat UI. */

        /** Whether this task listener supports compat UI. */

        default boolean supportCompatUI() {

        default boolean supportCompatUI() {

            // All TaskListeners should support compat UI except PIP.

            // All TaskListeners should support compat UI except PIP and StageCoordinator.

            return true;

            return true;

        }

        }

        /** Attaches a child window surface to the task surface. */

        /** Attaches a child window surface to the task surface. */

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -228,6 +228,15 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private final Toast mSplitUnsupportedToast;

    private final Toast mSplitUnsupportedToast;

    private SplitRequest mSplitRequest;

    private SplitRequest mSplitRequest;





    /**

     * Since StageCoordinator only coordinates MainStage and SideStage, it shouldn't support

     * CompatUI layouts. CompatUI is handled separately by MainStage and SideStage.

     */

    @Override

    public boolean supportCompatUI() {

        return false;

    }



    class SplitRequest {

    class SplitRequest {

        @SplitPosition

        @SplitPosition

        int mActivatePosition;

        int mActivatePosition;