Merge "Revert "Use out pipBounds to save reentry size""

    private final DisplayInfo mTmpDisplayInfo = new DisplayInfo();

    private final Rect mTmpInsetBounds = new Rect();

    private final Rect mTmpNormalBounds = new Rect();

    protected final Rect mReentryBounds = new Rect();

    private DisplayController mDisplayController;

    private PipAppOpsListener mAppOpsListener;

    public void onPipTransitionStarted(ComponentName activity, int direction, Rect pipBounds) {

        if (isOutPipDirection(direction)) {

            // Exiting PIP, save the reentry bounds to restore to when re-entering.

            mPipBoundsHandler.onSaveReentryBounds(activity, pipBounds);

            updateReentryBounds(pipBounds);

            mPipBoundsHandler.onSaveReentryBounds(activity, mReentryBounds);

        }

        // Disable touches while the animation is running

        mTouchHandler.setTouchEnabled(false);

        }

    }

    /**

     * Update the bounds used to save the re-entry size and snap fraction when exiting PIP.

     */

    public void updateReentryBounds(Rect bounds) {

        final Rect reentryBounds = mTouchHandler.getUserResizeBounds();

        float snapFraction = mPipBoundsHandler.getSnapFraction(bounds);

        mPipBoundsHandler.applySnapFraction(reentryBounds, snapFraction);

        mReentryBounds.set(reentryBounds);

    }

    @Override

    public void onPipTransitionFinished(ComponentName activity, int direction) {

        onPipTransitionFinishedOrCanceled(direction);