diff options
author | Tony <twickham@google.com> | 2019-03-29 12:39:26 -0500 |
---|---|---|
committer | Tony <twickham@google.com> | 2019-03-29 14:06:03 -0500 |
commit | 443ce071e27e35f3088f9b22eaa1a0067a870417 (patch) | |
tree | 58d5d36553e9e184efd6bf9969fada0fea580bc1 | |
parent | 814b615b62a4eb69b70e1f52525ee9d6294909f8 (diff) | |
download | android_packages_apps_Trebuchet-443ce071e27e35f3088f9b22eaa1a0067a870417.tar.gz android_packages_apps_Trebuchet-443ce071e27e35f3088f9b22eaa1a0067a870417.tar.bz2 android_packages_apps_Trebuchet-443ce071e27e35f3088f9b22eaa1a0067a870417.zip |
Update task view corner radius to match window as it goes fullscreen
Bug: 129146690
Change-Id: I61f24d2ce07fd05653887626887e1ddaddee61d7
-rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java index 90604efef..a9f631185 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java @@ -46,6 +46,7 @@ import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.SystemUiController; import com.android.launcher3.util.Themes; +import com.android.quickstep.RecentsModel; import com.android.quickstep.TaskOverlayFactory; import com.android.quickstep.TaskOverlayFactory.TaskOverlay; import com.android.systemui.shared.recents.model.Task; @@ -81,6 +82,7 @@ public class TaskThumbnailView extends View { private final Paint mBackgroundPaint = new Paint(); private final Paint mClearPaint = new Paint(); private final Paint mDimmingPaintAfterClearing = new Paint(); + private final float mWindowCornerRadius; private final Matrix mMatrix = new Matrix(); @@ -114,6 +116,7 @@ public class TaskThumbnailView extends View { mDimmingPaintAfterClearing.setColor(Color.BLACK); mActivity = BaseActivity.fromContext(context); mIsDarkTextTheme = Themes.getAttrBoolean(mActivity, R.attr.isWorkspaceDarkText); + mWindowCornerRadius = RecentsModel.INSTANCE.get(context).getWindowCornerRadius(); } public void bind(Task task) { @@ -196,19 +199,22 @@ public class TaskThumbnailView extends View { @Override protected void onDraw(Canvas canvas) { - float fullscreenProgress = ((TaskView) getParent()).getFullscreenProgress(); + TaskView taskView = (TaskView) getParent(); + float fullscreenProgress = taskView.getFullscreenProgress(); if (mIsRotated) { // Don't show insets in the wrong orientation. fullscreenProgress = 0; } if (fullscreenProgress > 0) { // Draw the insets if we're being drawn fullscreen (we do this for quick switch). + float cornerRadius = Utilities.mapRange(fullscreenProgress, mCornerRadius, + mWindowCornerRadius); drawOnCanvas(canvas, -mScaledInsets.left * fullscreenProgress, -mScaledInsets.top * fullscreenProgress, getMeasuredWidth() + mScaledInsets.right * fullscreenProgress, getMeasuredHeight() + mScaledInsets.bottom * fullscreenProgress, - mCornerRadius); + cornerRadius / taskView.getRecentsView().getScaleX()); } else { drawOnCanvas(canvas, 0, 0, getMeasuredWidth(), getMeasuredHeight(), mCornerRadius); } |