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

Commit 93dddb4a authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "StageCoordinator shouldn't support CompatUI" into udc-qpr-dev

parents 2e5c0b58 f4d28f46

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

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

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

        default boolean supportCompatUI() {

            // All TaskListeners should support compat UI except PIP.

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

            return true;

        }

        /** 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 Diff line number Diff line
@@ -228,6 +228,15 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
    private final Toast mSplitUnsupportedToast;

    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 {

        @SplitPosition

        int mActivatePosition;