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

This commit is contained in:
Ben Lin
2021-02-01 22:35:13 +00:00
committed by Android (Google) Code Review

View File

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