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

Commit 5524cdd9 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Cleanup LegacySplitScreen usage in PiP 

Bug: 207532012
Test: verify PiP works with new split screen
Change-Id: I457bfc174ddf86f3005a47eb6f45eb926915757c
parent c4f898fb

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/TvPipModule.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.wm.shell.common.SyncTransactionQueue; 
import com.android.wm.shell.common.SystemWindows;

import com.android.wm.shell.common.SystemWindows;

import com.android.wm.shell.common.TaskStackListenerImpl;

import com.android.wm.shell.common.TaskStackListenerImpl;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;

import com.android.wm.shell.pip.Pip;

import com.android.wm.shell.pip.Pip;

import com.android.wm.shell.pip.PipAnimationController;

import com.android.wm.shell.pip.PipAnimationController;

import com.android.wm.shell.pip.PipMediaController;

import com.android.wm.shell.pip.PipMediaController;
@@ -163,15 +162,14 @@ public abstract class TvPipModule { 
            PipAnimationController pipAnimationController,

            PipAnimationController pipAnimationController,

            PipTransitionController pipTransitionController,

            PipTransitionController pipTransitionController,

            PipSurfaceTransactionHelper pipSurfaceTransactionHelper,

            PipSurfaceTransactionHelper pipSurfaceTransactionHelper,

            Optional<LegacySplitScreenController> splitScreenOptional,

            Optional<SplitScreenController> splitScreenControllerOptional,

            Optional<SplitScreenController> newSplitScreenOptional,

            DisplayController displayController,

            DisplayController displayController,

            PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer,

            PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer,

            @ShellMainThread ShellExecutor mainExecutor) {

            @ShellMainThread ShellExecutor mainExecutor) {

        return new PipTaskOrganizer(context,

        return new PipTaskOrganizer(context,

                syncTransactionQueue, pipTransitionState, tvPipBoundsState, tvPipBoundsAlgorithm,

                syncTransactionQueue, pipTransitionState, tvPipBoundsState, tvPipBoundsAlgorithm,

                tvPipMenuController, pipAnimationController, pipSurfaceTransactionHelper,

                tvPipMenuController, pipAnimationController, pipSurfaceTransactionHelper,

                pipTransitionController, splitScreenOptional, newSplitScreenOptional,

                pipTransitionController, splitScreenControllerOptional,

                displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor);

                displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor);

    }

    }

}
 
}

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -285,15 +285,14 @@ public class WMShellModule { 
            PipAnimationController pipAnimationController,

            PipAnimationController pipAnimationController,

            PipSurfaceTransactionHelper pipSurfaceTransactionHelper,

            PipSurfaceTransactionHelper pipSurfaceTransactionHelper,

            PipTransitionController pipTransitionController,

            PipTransitionController pipTransitionController,

            Optional<LegacySplitScreenController> splitScreenOptional,

            Optional<SplitScreenController> splitScreenControllerOptional,

            Optional<SplitScreenController> newSplitScreenOptional,

            DisplayController displayController,

            DisplayController displayController,

            PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer,

            PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer,

            @ShellMainThread ShellExecutor mainExecutor) {

            @ShellMainThread ShellExecutor mainExecutor) {

        return new PipTaskOrganizer(context,

        return new PipTaskOrganizer(context,

                syncTransactionQueue, pipTransitionState, pipBoundsState, pipBoundsAlgorithm,

                syncTransactionQueue, pipTransitionState, pipBoundsState, pipBoundsAlgorithm,

                menuPhoneController, pipAnimationController, pipSurfaceTransactionHelper,

                menuPhoneController, pipAnimationController, pipSurfaceTransactionHelper,

                pipTransitionController, splitScreenOptional, newSplitScreenOptional,

                pipTransitionController, splitScreenControllerOptional,

                displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor);

                displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor);

    }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+8 −32
Original line number Original line Diff line number Diff line
@@ -81,7 +81,6 @@ import com.android.wm.shell.common.ScreenshotUtils; 
import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.common.annotations.ShellMainThread;

import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;

import com.android.wm.shell.pip.phone.PipMotionHelper;

import com.android.wm.shell.pip.phone.PipMotionHelper;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

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

import com.android.wm.shell.splitscreen.SplitScreenController;
@@ -134,7 +133,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    private final int mExitAnimationDuration;

    private final int mExitAnimationDuration;

    private final int mCrossFadeAnimationDuration;

    private final int mCrossFadeAnimationDuration;

    private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;

    private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;

    private final Optional<LegacySplitScreenController> mLegacySplitScreenOptional;

    private final Optional<SplitScreenController> mSplitScreenOptional;

    private final Optional<SplitScreenController> mSplitScreenOptional;

    protected final ShellTaskOrganizer mTaskOrganizer;

    protected final ShellTaskOrganizer mTaskOrganizer;

    protected final ShellExecutor mMainExecutor;

    protected final ShellExecutor mMainExecutor;
@@ -261,7 +259,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            @NonNull PipAnimationController pipAnimationController,

            @NonNull PipAnimationController pipAnimationController,

            @NonNull PipSurfaceTransactionHelper surfaceTransactionHelper,

            @NonNull PipSurfaceTransactionHelper surfaceTransactionHelper,

            @NonNull PipTransitionController pipTransitionController,

            @NonNull PipTransitionController pipTransitionController,

            Optional<LegacySplitScreenController> legacySplitScreenOptional,

            Optional<SplitScreenController> splitScreenOptional,

            Optional<SplitScreenController> splitScreenOptional,

            @NonNull DisplayController displayController,

            @NonNull DisplayController displayController,

            @NonNull PipUiEventLogger pipUiEventLogger,

            @NonNull PipUiEventLogger pipUiEventLogger,
@@ -284,7 +281,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        mPipAnimationController = pipAnimationController;

        mPipAnimationController = pipAnimationController;

        mPipUiEventLoggerLogger = pipUiEventLogger;

        mPipUiEventLoggerLogger = pipUiEventLogger;

        mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;

        mSurfaceControlTransactionFactory = SurfaceControl.Transaction::new;

        mLegacySplitScreenOptional = legacySplitScreenOptional;

        mSplitScreenOptional = splitScreenOptional;

        mSplitScreenOptional = splitScreenOptional;

        mTaskOrganizer = shellTaskOrganizer;

        mTaskOrganizer = shellTaskOrganizer;

        mMainExecutor = mainExecutor;

        mMainExecutor = mainExecutor;
@@ -492,11 +488,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        wct.setWindowingMode(mToken, getOutPipWindowingMode());

        wct.setWindowingMode(mToken, getOutPipWindowingMode());

        // Simply reset the activity mode set prior to the animation running.

        // Simply reset the activity mode set prior to the animation running.

        wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);

        wct.setActivityWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);

        mLegacySplitScreenOptional.ifPresent(splitScreen -> {

            if (direction == TRANSITION_DIRECTION_LEAVE_PIP_TO_SPLIT_SCREEN) {

                wct.reparent(mToken, splitScreen.getSecondaryRoot(), true /* onTop */);

            }

        });

    }

    }





    /**

    /**
@@ -1478,14 +1469,16 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    }

    }





    /**

    /**

     * Sync with {@link LegacySplitScreenController} or {@link SplitScreenController} on destination

     * Sync with {@link SplitScreenController} on destination bounds if PiP is going to

     * bounds if PiP is going to split screen.

     * split screen.

     *

     *

     * @param destinationBoundsOut contain the updated destination bounds if applicable

     * @param destinationBoundsOut contain the updated destination bounds if applicable

     * @return {@code true} if destinationBounds is altered for split screen

     * @return {@code true} if destinationBounds is altered for split screen

     */

     */

    private boolean syncWithSplitScreenBounds(Rect destinationBoundsOut, boolean enterSplit) {

    private boolean syncWithSplitScreenBounds(Rect destinationBoundsOut, boolean enterSplit) {

        if (enterSplit && mSplitScreenOptional.isPresent()) {

        if (!enterSplit || !mSplitScreenOptional.isPresent()) {

            return false;

        }

        final Rect topLeft = new Rect();

        final Rect topLeft = new Rect();

        final Rect bottomRight = new Rect();

        final Rect bottomRight = new Rect();

        mSplitScreenOptional.get().getStageBounds(topLeft, bottomRight);

        mSplitScreenOptional.get().getStageBounds(topLeft, bottomRight);
@@ -1494,23 +1487,6 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        return true;

        return true;

    }

    }





        if (!mLegacySplitScreenOptional.isPresent()) {

            return false;

        }



        LegacySplitScreenController legacySplitScreen = mLegacySplitScreenOptional.get();

        if (!legacySplitScreen.isDividerVisible()) {

            // fail early if system is not in split screen mode

            return false;

        }



        // PiP window will go to split-secondary mode instead of fullscreen, populates the

        // split screen bounds here.

        destinationBoundsOut.set(legacySplitScreen.getDividerView()

                .getNonMinimizedSplitScreenSecondaryBounds());

        return true;

    }



    /**

    /**

     * Fades out and removes an overlay surface.

     * Fades out and removes an overlay surface.

     */

     */

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/PipTaskOrganizerTest.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ import com.android.wm.shell.TestShellExecutor; 
import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController;

import com.android.wm.shell.pip.phone.PhonePipMenuController;

import com.android.wm.shell.pip.phone.PhonePipMenuController;

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

import com.android.wm.shell.splitscreen.SplitScreenController;
@@ -76,7 +75,6 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
    @Mock private PipTransitionController mMockPipTransitionController;

    @Mock private PipTransitionController mMockPipTransitionController;

    @Mock private PipSurfaceTransactionHelper mMockPipSurfaceTransactionHelper;

    @Mock private PipSurfaceTransactionHelper mMockPipSurfaceTransactionHelper;

    @Mock private PipUiEventLogger mMockPipUiEventLogger;

    @Mock private PipUiEventLogger mMockPipUiEventLogger;

    @Mock private Optional<LegacySplitScreenController> mMockOptionalLegacySplitScreen;

    @Mock private Optional<SplitScreenController> mMockOptionalSplitScreen;

    @Mock private Optional<SplitScreenController> mMockOptionalSplitScreen;

    @Mock private ShellTaskOrganizer mMockShellTaskOrganizer;

    @Mock private ShellTaskOrganizer mMockShellTaskOrganizer;

    private TestShellExecutor mMainExecutor;

    private TestShellExecutor mMainExecutor;
@@ -101,8 +99,8 @@ public class PipTaskOrganizerTest extends ShellTestCase { 
                mMockSyncTransactionQueue, mPipTransitionState, mPipBoundsState,

                mMockSyncTransactionQueue, mPipTransitionState, mPipBoundsState,

                mPipBoundsAlgorithm, mMockPhonePipMenuController,

                mPipBoundsAlgorithm, mMockPhonePipMenuController,

                mMockPipAnimationController, mMockPipSurfaceTransactionHelper,

                mMockPipAnimationController, mMockPipSurfaceTransactionHelper,

                mMockPipTransitionController, mMockOptionalLegacySplitScreen,

                mMockPipTransitionController, mMockOptionalSplitScreen,

                mMockOptionalSplitScreen, mMockDisplayController, mMockPipUiEventLogger,

                mMockDisplayController, mMockPipUiEventLogger,

                mMockShellTaskOrganizer, mMainExecutor));

                mMockShellTaskOrganizer, mMainExecutor));

        mMainExecutor.flushAll();

        mMainExecutor.flushAll();

        preparePipTaskOrg();

        preparePipTaskOrg();