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

Commit 7d9d26a7 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

[RESTRICT AUTOMERGE] Ignore small source rect hint am: a54d7638 

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



Change-Id: I1e3f37ca0afec74271252f9c7fed24169b58bb49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26068ce8 a54d7638

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+8 −4
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ public class PipTaskOrganizer extends TaskOrganizer implements 
        final Rect currentBounds = mTaskInfo.configuration.windowConfiguration.getBounds();



        if (mOneShotAnimationType == ANIM_TYPE_BOUNDS) {

            final Rect sourceHintRect = getValidSourceHintRect(info, currentBounds);

            final Rect sourceHintRect = getValidSourceHintRect(info, currentBounds,

                    destinationBounds);

            scheduleAnimateResizePip(currentBounds, destinationBounds, sourceHintRect,

                    TRANSITION_DIRECTION_TO_PIP, mEnterExitAnimationDuration,

                    null /* updateBoundsCallback */);
@@ -457,14 +458,17 @@ public class PipTaskOrganizer extends TaskOrganizer implements 


    /**

     * Returns the source hint rect if it is valid (if provided and is contained by the current

     * task bounds).

     * task bounds and not too small).

     */

    private Rect getValidSourceHintRect(ActivityManager.RunningTaskInfo info, Rect sourceBounds) {

    private Rect getValidSourceHintRect(ActivityManager.RunningTaskInfo info, Rect sourceBounds,

            Rect destinationBounds) {

        final Rect sourceHintRect = info.pictureInPictureParams != null

                && info.pictureInPictureParams.hasSourceBoundsHint()

                ? info.pictureInPictureParams.getSourceRectHint()

                : null;

        if (sourceHintRect != null && sourceBounds.contains(sourceHintRect)) {

        if (sourceHintRect != null && sourceBounds.contains(sourceHintRect)

                && sourceHintRect.width() > destinationBounds.width()

                && sourceHintRect.height() > destinationBounds.height()) {

            return sourceHintRect;

        }

        return null;