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

Commit 93864718 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b5d02253c0ce95b420353b46f56a1632ee48a79
parents a960fc97 139f6ec4

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

+2 −3
Original line number Diff line number Diff line
@@ -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