Merge "PiP: Double-tap to maximum, again to go back to last resized size." into sc-dev am: 6d00ea7a4a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I961293e52badcafab885b1a8ac60e5c1639956b1
This commit is contained in:
Ben Lin
2021-02-01 22:39:43 +00:00
committed by Automerger Merge Worker

View File

@@ -30,7 +30,6 @@ import android.content.res.Resources;
import android.graphics.Point;
import android.graphics.PointF;
import android.graphics.Rect;
import android.os.Handler;
import android.provider.DeviceConfig;
import android.util.Log;
import android.util.Size;
@@ -847,11 +846,11 @@ public class PipTouchHandler {
&& mPipBoundsState.getBounds().height()
< mPipBoundsState.getMaxSize().y;
if (toExpand) {
mPipResizeGestureHandler.setUserResizeBounds(mPipBoundsState.getBounds());
animateToMaximizedState(null);
} else {
animateToMinimizedState();
animateToUnexpandedState(getUserResizeBounds());
}
mPipResizeGestureHandler.setUserResizeBounds(mPipBoundsState.getBounds());
} else {
// Expand to fullscreen if this is a double tap
// the PiP should be frozen until the transition ends