aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove mSourceWindowClipInsetsForLiveTile" into ub-launcher3-master

Browse Source
This commit is contained in:
Tony Wickham
2020-02-22 00:34:09 +00:00
committed by Android (Google) Code Review
parent 6b029c30b1 a754374c30
commit 3310b76a27
2 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java
View File

@@ -70,9 +70,6 @@ public class AppWindowAnimationHelper {
// if the aspect ratio of the target is smaller than the aspect ratio of the source rect. In
// app window coordinates.
private final RectF mSourceWindowClipInsets = new RectF();
// The insets to be used for clipping the app window. For live tile, we don't transform the clip
// relative to the target rect.
private final RectF mSourceWindowClipInsetsForLiveTile = new RectF();
// The clip rect in source app window coordinates. The app window surface will only be drawn
// within these bounds. This clip rect starts at the full mSourceStackBounds, and insets by
// mSourceWindowClipInsets as the transform progress goes to 1.
@@ -149,7 +146,6 @@ public class AppWindowAnimationHelper {
Math.max(scaledTargetRect.top, 0),
Math.max(mSourceStackBounds.width() - scaledTargetRect.right, 0),
Math.max(mSourceStackBounds.height() - scaledTargetRect.bottom, 0));
mSourceWindowClipInsetsForLiveTile.set(mSourceWindowClipInsets);
mSourceRect.set(scaledTargetRect);
}
@@ -252,14 +248,12 @@ public class AppWindowAnimationHelper {
private void updateClipRect(TransformParams params) {
// Don't clip past progress > 1.
float progress = Math.min(1, params.mProgress);
final RectF sourceWindowClipInsets = params.mForLiveTile
? mSourceWindowClipInsetsForLiveTile : mSourceWindowClipInsets;
mCurrentClipRectF.left = sourceWindowClipInsets.left * progress;
mCurrentClipRectF.top = sourceWindowClipInsets.top * progress;
mCurrentClipRectF.left = mSourceWindowClipInsets.left * progress;
mCurrentClipRectF.top = mSourceWindowClipInsets.top * progress;
mCurrentClipRectF.right =
mSourceStackBounds.width() - (sourceWindowClipInsets.right * progress);
mSourceStackBounds.width() - (mSourceWindowClipInsets.right * progress);
mCurrentClipRectF.bottom =
mSourceStackBounds.height() - (sourceWindowClipInsets.bottom * progress);
mSourceStackBounds.height() - (mSourceWindowClipInsets.bottom * progress);
}
public RectF getCurrentRectWithInsets() {
@@ -400,7 +394,6 @@ public class AppWindowAnimationHelper {
private float mOffsetScale;
private @Nullable RectF mCurrentRect;
private float mTargetAlpha;
private boolean mForLiveTile;
private float mCornerRadius;
private boolean mLauncherOnTop;
private RemoteAnimationTargets mTargetSet;
@@ -412,7 +405,6 @@ public class AppWindowAnimationHelper {
mOffsetScale = 1;
mCurrentRect = null;
mTargetAlpha = 1;
mForLiveTile = false;
mCornerRadius = -1;
mLauncherOnTop = false;
}
@@ -476,16 +468,6 @@ public class AppWindowAnimationHelper {
return this;
}
/**
* Specifies whether we should clip the source window based on
* {@link AppWindowAnimationHelper#mSourceWindowClipInsetsForLiveTile} rather than
* {@link AppWindowAnimationHelper#mSourceWindowClipInsets} as {@link #mProgress} goes to 1.
*/
public TransformParams setForLiveTile(boolean forLiveTile) {
mForLiveTile = forLiveTile;
return this;
}
/**
* If true, sets the crop = null and layer = Integer.MAX_VALUE for targets that don't match
* {@link #mTargetSet}.targetMode. (Currently only does this when live tiles are enabled.)
@@ -539,10 +521,6 @@ public class AppWindowAnimationHelper {
return mTargetAlpha;
}
public boolean isForLiveTile() {
return mForLiveTile;
}
public float getCornerRadius() {
return mCornerRadius;
}

3
quickstep/recents_ui_overrides/src/com/android/quickstep/views/LauncherRecentsView.java
View File

@@ -201,8 +201,7 @@ public class LauncherRecentsView extends RecentsView<Launcher> implements StateL
if (tv.isRunningTask()) {
mTransformParams.setProgress(1 - progress)
.setCurrentRect(null)
.setSyncTransactionApplier(mSyncTransactionApplier)
.setForLiveTile(true);
.setSyncTransactionApplier(mSyncTransactionApplier);
mAppWindowAnimationHelper.applyTransform(mTransformParams);
} else {
redrawLiveTile(true);