aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 01:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Scale task's rounded corners in grid to match focused task." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-09 11:51:32 +00:00
committed by Android (Google) Code Review
parent 9bd2802c9b d0f5791c84
commit 87f764cea1
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
View File

@@ -296,9 +296,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
}
float fullScreenProgress = Utilities.boundToRange(this.fullScreenProgress.value, 0, 1);
mCurrentFullscreenParams.setProgress(
fullScreenProgress, recentsViewScale.value, /*taskViewScale=*/1f, mTaskRect.width(),
mDp, mPositionHelper);
mCurrentFullscreenParams.setProgress(fullScreenProgress, recentsViewScale.value,
/* taskViewScale= */1f, mTaskRect.width(), mDp, mPositionHelper);
// Apply thumbnail matrix
RectF insets = mCurrentFullscreenParams.mCurrentDrawnInsets;

16
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -1071,7 +1071,6 @@ public class TaskView extends FrameLayout implements Reusable {
private void setNonGridScale(float nonGridScale) {
mNonGridScale = nonGridScale;
updateCornerRadius();
applyScale();
}
@@ -1102,6 +1101,7 @@ public class TaskView extends FrameLayout implements Reusable {
scale *= mDismissScale;
setScaleX(scale);
setScaleY(scale);
updateSnapshotRadius();
}
/**
@@ -1417,29 +1417,25 @@ public class TaskView extends FrameLayout implements Reusable {
mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
mSnapshotView.getTaskOverlay().setFullscreenProgress(progress);
updateCornerRadius();
updateSnapshotRadius();
mSnapshotView.setFullscreenParams(mCurrentFullscreenParams);
mOutlineProvider.updateParams(
mCurrentFullscreenParams,
mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx);
invalidateOutline();
}
private void updateCornerRadius() {
private void updateSnapshotRadius() {
updateCurrentFullscreenParams(mSnapshotView.getPreviewPositionHelper());
mSnapshotView.setFullscreenParams(mCurrentFullscreenParams);
}
void updateCurrentFullscreenParams(PreviewPositionHelper previewPositionHelper) {
if (getRecentsView() == null) {
return;
}
mCurrentFullscreenParams.setProgress(
mFullscreenProgress,
getRecentsView().getScaleX(),
mNonGridScale,
getWidth(), mActivity.getDeviceProfile(),
previewPositionHelper);
mCurrentFullscreenParams.setProgress(mFullscreenProgress, getRecentsView().getScaleX(),
getScaleX(), getWidth(), mActivity.getDeviceProfile(), previewPositionHelper);
}
/**