Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add gradient to PIP dismiss target, per mocks." into rvc-dev am: 3e29cb85d5 am: 3ff8830b6b am: 6b5e430559

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

Change-Id: If3b1a344441076fdd9c9b5650daf9e152776b162
This commit is contained in:
TreeHugger Robot
2020-06-08 22:44:21 +00:00
committed by Automerger Merge Worker
parent 25d1adf8c9 6b5e430559
commit a9026e69fb
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
View File

@@ -30,6 +30,7 @@ import android.graphics.PixelFormat;
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.graphics.drawable.TransitionDrawable;
import android.os.Handler; import android.os.Handler;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.Log; import android.util.Log;
@@ -76,6 +77,9 @@ import java.io.PrintWriter;
public class PipTouchHandler { public class PipTouchHandler {
private static final String TAG = "PipTouchHandler"; private static final String TAG = "PipTouchHandler";
/** Duration of the dismiss scrim fading in/out. */
private static final int DISMISS_TRANSITION_DURATION_MS = 200;
// Allow dragging the PIP to a location to close it // Allow dragging the PIP to a location to close it
private final boolean mEnableDismissDragToEdge; private final boolean mEnableDismissDragToEdge;
// Allow PIP to resize to a slightly bigger state upon touch // Allow PIP to resize to a slightly bigger state upon touch
@@ -249,6 +253,8 @@ public class PipTouchHandler {
mTargetView = new DismissCircleView(context); mTargetView = new DismissCircleView(context);
mTargetViewContainer = new FrameLayout(context); mTargetViewContainer = new FrameLayout(context);
mTargetViewContainer.setBackgroundDrawable(
context.getDrawable(R.drawable.floating_dismiss_gradient_transition));
mTargetViewContainer.setClipChildren(false); mTargetViewContainer.setClipChildren(false);
mTargetViewContainer.addView(mTargetView); mTargetViewContainer.addView(mTargetView);
@@ -553,6 +559,9 @@ public class PipTouchHandler {
mMagneticTargetAnimator mMagneticTargetAnimator
.spring(DynamicAnimation.TRANSLATION_Y, 0f, mTargetSpringConfig) .spring(DynamicAnimation.TRANSLATION_Y, 0f, mTargetSpringConfig)
.start(); .start();
((TransitionDrawable) mTargetViewContainer.getBackground()).startTransition(
DISMISS_TRANSITION_DURATION_MS);
} }
} }
@@ -565,6 +574,9 @@ public class PipTouchHandler {
mTargetSpringConfig) mTargetSpringConfig)
.withEndActions(() -> mTargetViewContainer.setVisibility(View.GONE)) .withEndActions(() -> mTargetViewContainer.setVisibility(View.GONE))
.start(); .start();
((TransitionDrawable) mTargetViewContainer.getBackground()).reverseTransition(
DISMISS_TRANSITION_DURATION_MS);
} }
/** /**