Revert "Correct ⭕ ⛶ 🕳️ 👊👊👊👊👊👊"
This reverts commit aaf859f2389091546fa230e34bad5df767c4c97f.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Iedd45033adb29664107471f7af6b0249e5370470
diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
index 16f5fa1..d78ba9c 100644
--- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java
+++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java
@@ -553,8 +553,7 @@
public void finish() { }
@Override
- public void update(boolean shouldFinish, boolean isLongSwipe, RectF currentRect,
- float cornerRadius) { }
+ public void update(boolean shouldFinish, boolean isLongSwipe, RectF currentRect) { }
};
}
@@ -632,8 +631,7 @@
void finish();
- void update(boolean shouldFinish, boolean isLongSwipe, RectF currentRect,
- float cornerRadius);
+ void update(boolean shouldFinish, boolean isLongSwipe, RectF currentRect);
}
interface ActivityInitListener {
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 78a2055..f4b2feb 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -601,8 +601,7 @@
private void updateFinalShiftUi() {
if (mRecentsAnimationWrapper.getController() != null && mLayoutListener != null) {
mLayoutListener.update(mCurrentShift.value > 1, mUiLongSwipeMode,
- mClipAnimationHelper.getCurrentRectWithInsets(),
- mClipAnimationHelper.getCurrentCornerRadius());
+ mClipAnimationHelper.getCurrentRectWithInsets());
}
final boolean passed = mCurrentShift.value >= MIN_PROGRESS_FOR_OVERVIEW;
diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
index 8c9cead..f254244 100644
--- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
+++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java
@@ -88,8 +88,6 @@
// Corner radius of windows when they're in overview mode.
private final float mTaskCornerRadius;
- // Corner radius currently applied to transformed window.
- private float mCurrentCornerRadius;
private float mTargetScale = 1f;
private float mOffsetScale = 1f;
private Interpolator mInterpolator = LINEAR;
@@ -181,15 +179,14 @@
float alpha = 1f;
int layer;
float cornerRadius = 0f;
- float scale = currentRect.width() / crop.width();
if (app.mode == targetSet.targetMode) {
if (app.activityType != RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {
mTmpMatrix.setRectToRect(mSourceRect, currentRect, ScaleToFit.FILL);
mTmpMatrix.postTranslate(app.position.x, app.position.y);
mClipRectF.roundOut(crop);
+ float scale = crop.width() / currentRect.width();
cornerRadius = Utilities.mapRange(progress, mWindowCornerRadius,
- mTaskCornerRadius);
- mCurrentCornerRadius = cornerRadius;
+ mTaskCornerRadius * scale);
}
if (app.isNotInRecents
@@ -203,11 +200,7 @@
crop = null;
layer = Integer.MAX_VALUE;
}
-
- // Since radius is in Surface space, but we draw the rounded corners in screen space, we
- // have to undo the scale.
- params[i] = new SurfaceParams(app.leash, alpha, mTmpMatrix, crop, layer,
- cornerRadius / scale);
+ params[i] = new SurfaceParams(app.leash, alpha, mTmpMatrix, crop, layer, cornerRadius);
}
applyParams(syncTransactionApplier, params);
return currentRect;
@@ -346,8 +339,4 @@
public RectF getSourceRect() {
return mSourceRect;
}
-
- public float getCurrentCornerRadius() {
- return mCurrentCornerRadius;
- }
}
diff --git a/quickstep/src/com/android/quickstep/views/LauncherLayoutListener.java b/quickstep/src/com/android/quickstep/views/LauncherLayoutListener.java
index 8ec5361..c12a579 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherLayoutListener.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherLayoutListener.java
@@ -43,7 +43,6 @@
private final Paint mPaint = new Paint();
private WindowTransformSwipeHandler mHandler;
private RectF mCurrentRect;
- private float mCornerRadius;
public LauncherLayoutListener(Launcher launcher) {
super(launcher, null);
@@ -53,15 +52,13 @@
}
@Override
- public void update(boolean shouldFinish, boolean isLongSwipe, RectF currentRect,
- float cornerRadius) {
+ public void update(boolean shouldFinish, boolean isLongSwipe, RectF currentRect) {
if (shouldFinish) {
finish();
return;
}
mCurrentRect = currentRect;
- mCornerRadius = cornerRadius;
setWillNotDraw(mCurrentRect == null || isLongSwipe);
invalidate();
@@ -124,6 +121,6 @@
@Override
protected void onDraw(Canvas canvas) {
- canvas.drawRoundRect(mCurrentRect, mCornerRadius, mCornerRadius, mPaint);
+ canvas.drawRect(mCurrentRect, mPaint);
}
}