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

Commit 063dc4be authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Merge "Pip entry bounds incorrect upon rotation" into tm-qpr-dev am:... 

Merge "Merge "Pip entry bounds incorrect upon rotation" into tm-qpr-dev am: 5f5fe884 am: b451f4dd"
parents 91c2e6a9 dec21af1

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

+6 −4
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ public abstract class TvPipModule { 
            TvPipMenuController tvPipMenuController,

            SyncTransactionQueue syncTransactionQueue,

            TvPipBoundsState tvPipBoundsState,

            PipSizeSpecHandler pipSizeSpecHandler,

            PipTransitionState pipTransitionState,

            TvPipBoundsAlgorithm tvPipBoundsAlgorithm,

            PipAnimationController pipAnimationController,
@@ -214,10 +215,11 @@ public abstract class TvPipModule { 
            PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new TvPipTaskOrganizer(context,

                syncTransactionQueue, pipTransitionState, tvPipBoundsState, tvPipBoundsAlgorithm,

                tvPipMenuController, pipAnimationController, pipSurfaceTransactionHelper,

                pipTransitionController, pipParamsChangedForwarder, splitScreenControllerOptional,

                displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor);

                syncTransactionQueue, pipTransitionState, tvPipBoundsState, pipSizeSpecHandler,

                tvPipBoundsAlgorithm, tvPipMenuController, pipAnimationController,

                pipSurfaceTransactionHelper, pipTransitionController, pipParamsChangedForwarder,

                splitScreenControllerOptional, displayController, pipUiEventLogger,

                shellTaskOrganizer, mainExecutor);

    }



    @WMSingleton

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

+11 −8
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ public abstract class WMShellModule { 
            SyncTransactionQueue syncTransactionQueue,

            PipTransitionState pipTransitionState,

            PipBoundsState pipBoundsState,

            PipSizeSpecHandler pipSizeSpecHandler,

            PipBoundsAlgorithm pipBoundsAlgorithm,

            PhonePipMenuController menuPhoneController,

            PipAnimationController pipAnimationController,
@@ -455,10 +456,11 @@ public abstract class WMShellModule { 
            PipUiEventLogger pipUiEventLogger, ShellTaskOrganizer shellTaskOrganizer,

            @ShellMainThread ShellExecutor mainExecutor) {

        return new PipTaskOrganizer(context,

                syncTransactionQueue, pipTransitionState, pipBoundsState, pipBoundsAlgorithm,

                menuPhoneController, pipAnimationController, pipSurfaceTransactionHelper,

                pipTransitionController, pipParamsChangedForwarder, splitScreenControllerOptional,

                displayController, pipUiEventLogger, shellTaskOrganizer, mainExecutor);

                syncTransactionQueue, pipTransitionState, pipBoundsState, pipSizeSpecHandler,

                pipBoundsAlgorithm, menuPhoneController, pipAnimationController,

                pipSurfaceTransactionHelper, pipTransitionController, pipParamsChangedForwarder,

                splitScreenControllerOptional, displayController, pipUiEventLogger,

                shellTaskOrganizer, mainExecutor);

    }



    @WMSingleton
@@ -473,13 +475,14 @@ public abstract class WMShellModule { 
    static PipTransitionController providePipTransitionController(Context context,

            ShellInit shellInit, ShellTaskOrganizer shellTaskOrganizer, Transitions transitions,

            PipAnimationController pipAnimationController, PipBoundsAlgorithm pipBoundsAlgorithm,

            PipBoundsState pipBoundsState, PipTransitionState pipTransitionState,

            PhonePipMenuController pipMenuController,

            PipBoundsState pipBoundsState, PipSizeSpecHandler pipSizeSpecHandler,

            PipTransitionState pipTransitionState, PhonePipMenuController pipMenuController,

            PipSurfaceTransactionHelper pipSurfaceTransactionHelper,

            Optional<SplitScreenController> splitScreenOptional) {

        return new PipTransition(context, shellInit, shellTaskOrganizer, transitions,

                pipBoundsState, pipTransitionState, pipMenuController, pipBoundsAlgorithm,

                pipAnimationController, pipSurfaceTransactionHelper, splitScreenOptional);

                pipBoundsState, pipSizeSpecHandler, pipTransitionState, pipMenuController,

                pipBoundsAlgorithm, pipAnimationController, pipSurfaceTransactionHelper,

                splitScreenOptional);

    }



    @WMSingleton

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

+2 −2
Original line number Diff line number Diff line
@@ -311,10 +311,10 @@ public class PipBoundsState { 
        mDisplayLayout.set(displayLayout);

    }



    /** Get the display layout. */

    /** Get a copy of the display layout. */

    @NonNull

    public DisplayLayout getDisplayLayout() {

        return mDisplayLayout;

        return new DisplayLayout(mDisplayLayout);

    }



    @VisibleForTesting

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

+11 −1
Original line number Diff line number Diff line
@@ -79,11 +79,13 @@ import com.android.wm.shell.R; 
import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.animation.Interpolators;

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

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

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

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

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

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

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

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

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

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

import com.android.wm.shell.transition.Transitions;
@@ -126,6 +128,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    private final Context mContext;

    private final SyncTransactionQueue mSyncTransactionQueue;

    private final PipBoundsState mPipBoundsState;

    private final PipSizeSpecHandler mPipSizeSpecHandler;

    private final PipBoundsAlgorithm mPipBoundsAlgorithm;

    private final @NonNull PipMenuController mPipMenuController;

    private final PipAnimationController mPipAnimationController;
@@ -313,6 +316,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            @NonNull SyncTransactionQueue syncTransactionQueue,

            @NonNull PipTransitionState pipTransitionState,

            @NonNull PipBoundsState pipBoundsState,

            @NonNull PipSizeSpecHandler pipSizeSpecHandler,

            @NonNull PipBoundsAlgorithm boundsHandler,

            @NonNull PipMenuController pipMenuController,

            @NonNull PipAnimationController pipAnimationController,
@@ -328,6 +332,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        mSyncTransactionQueue = syncTransactionQueue;

        mPipTransitionState = pipTransitionState;

        mPipBoundsState = pipBoundsState;

        mPipSizeSpecHandler = pipSizeSpecHandler;

        mPipBoundsAlgorithm = boundsHandler;

        mPipMenuController = pipMenuController;

        mPipTransitionController = pipTransitionController;
@@ -1601,7 +1606,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    private @Nullable Rect computeRotatedBounds(int rotationDelta, int direction,

            Rect outDestinationBounds, Rect sourceHintRect) {

        if (direction == TRANSITION_DIRECTION_TO_PIP) {

            mPipBoundsState.getDisplayLayout().rotateTo(mContext.getResources(), mNextRotation);

            DisplayLayout layoutCopy = mPipBoundsState.getDisplayLayout();



            layoutCopy.rotateTo(mContext.getResources(), mNextRotation);

            mPipBoundsState.setDisplayLayout(layoutCopy);

            mPipSizeSpecHandler.setDisplayLayout(layoutCopy);



            final Rect displayBounds = mPipBoundsState.getDisplayBounds();

            outDestinationBounds.set(mPipBoundsAlgorithm.getEntryDestinationBounds());

            // Transform the destination bounds to current display coordinates.

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

+17 −2
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ import androidx.annotation.Nullable; 
import com.android.internal.protolog.common.ProtoLog;

import com.android.wm.shell.R;

import com.android.wm.shell.ShellTaskOrganizer;

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

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

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

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

import com.android.wm.shell.sysui.ShellInit;
@@ -83,6 +85,7 @@ public class PipTransition extends PipTransitionController { 


    private final Context mContext;

    private final PipTransitionState mPipTransitionState;

    private final PipSizeSpecHandler mPipSizeSpecHandler;

    private final int mEnterExitAnimationDuration;

    private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;

    private final Optional<SplitScreenController> mSplitScreenOptional;
@@ -113,6 +116,7 @@ public class PipTransition extends PipTransitionController { 
            @NonNull ShellTaskOrganizer shellTaskOrganizer,

            @NonNull Transitions transitions,

            PipBoundsState pipBoundsState,

            PipSizeSpecHandler pipSizeSpecHandler,

            PipTransitionState pipTransitionState,

            PipMenuController pipMenuController,

            PipBoundsAlgorithm pipBoundsAlgorithm,
@@ -123,6 +127,7 @@ public class PipTransition extends PipTransitionController { 
                pipBoundsAlgorithm, pipAnimationController);

        mContext = context;

        mPipTransitionState = pipTransitionState;

        mPipSizeSpecHandler = pipSizeSpecHandler;

        mEnterExitAnimationDuration = context.getResources()

                .getInteger(R.integer.config_pipResizeAnimationDuration);

        mSurfaceTransactionHelper = pipSurfaceTransactionHelper;
@@ -308,7 +313,12 @@ public class PipTransition extends PipTransitionController { 
            // initial state under the new rotation.

            int rotationDelta = deltaRotation(startRotation, endRotation);

            if (rotationDelta != Surface.ROTATION_0) {

                mPipBoundsState.getDisplayLayout().rotateTo(mContext.getResources(), endRotation);

                DisplayLayout layoutCopy = mPipBoundsState.getDisplayLayout();



                layoutCopy.rotateTo(mContext.getResources(), endRotation);

                mPipBoundsState.setDisplayLayout(layoutCopy);

                mPipSizeSpecHandler.setDisplayLayout(layoutCopy);



                final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();

                wct.setBounds(mRequestedEnterTask, destinationBounds);

                return true;
@@ -824,7 +834,12 @@ public class PipTransition extends PipTransitionController { 
    /** Computes destination bounds in old rotation and updates source hint rect if available. */

    private void computeEnterPipRotatedBounds(int rotationDelta, int startRotation, int endRotation,

            TaskInfo taskInfo, Rect outDestinationBounds, @Nullable Rect outSourceHintRect) {

        mPipBoundsState.getDisplayLayout().rotateTo(mContext.getResources(), endRotation);

        DisplayLayout layoutCopy = mPipBoundsState.getDisplayLayout();



        layoutCopy.rotateTo(mContext.getResources(), endRotation);

        mPipBoundsState.setDisplayLayout(layoutCopy);

        mPipSizeSpecHandler.setDisplayLayout(layoutCopy);



        final Rect displayBounds = mPipBoundsState.getDisplayBounds();

        outDestinationBounds.set(mPipBoundsAlgorithm.getEntryDestinationBounds());

        // Transform the destination bounds to current display coordinates.