From 0602e9342620b6da0e2f6a11eacf578a148d19d9 Mon Sep 17 00:00:00 2001 From: Federico Baron Date: Mon, 26 Sep 2022 17:23:09 -0700 Subject: [PATCH 1/2] Fix the entry animation for delightful pagination in folders Here we fix the animation that was broken in earlier CL's for delightful pagination, now the page indicator has the same smooth entry animation as the dots Bug: 247561880 Test: manual Change-Id: I3e2099ba4f5ccfdbc9b4dfe5b48a1c44dbdeda1e --- .../pageindicators/PageIndicatorDots.java | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index 28e0b68b4c..b4cb0eef6e 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -153,6 +153,7 @@ public class PageIndicatorDots extends View implements PageIndicator { @Override public void setScroll(int currentScroll, int totalScroll) { if (mNumPages <= 1) { + mCurrentScroll = 0; return; } @@ -296,8 +297,12 @@ public class PageIndicatorDots extends View implements PageIndicator { for (int i = 0; i < mEntryAnimationRadiusFactors.length; i++) { mPaginationPaint.setAlpha(i == mActivePage ? PAGE_INDICATOR_ALPHA : DOT_ALPHA); if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { - canvas.drawCircle(x, y, getRadius(x) * mEntryAnimationRadiusFactors[i], - mPaginationPaint); + if (i != mActivePage) { + canvas.drawCircle(x, y, mDotRadius * mEntryAnimationRadiusFactors[i], + mPaginationPaint); + } else { + drawPageIndicator(canvas, mEntryAnimationRadiusFactors[i]); + } } else { canvas.drawCircle(x, y, mDotRadius * mEntryAnimationRadiusFactors[i], mPaginationPaint); @@ -319,26 +324,43 @@ public class PageIndicatorDots extends View implements PageIndicator { // Here we draw the current page indicator mPaginationPaint.setAlpha(PAGE_INDICATOR_ALPHA); if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { - RectF currRect = getActiveRect(); - - // Moves the canvas to start at the top left corner of the page indicator - canvas.translate(currRect.left, currRect.top); - - int scrollPerPage = getScrollPerPage(); - // This IF is to avoid division by 0 - if (scrollPerPage != 0) { - int delta = mCurrentScroll % scrollPerPage; - canvas.rotate((INDICATOR_ROTATION * delta) / scrollPerPage, - mPageIndicatorRadius, mPageIndicatorRadius); - } - - mPageIndicatorDrawable.draw(canvas); + drawPageIndicator(canvas, 1); } else { canvas.drawRoundRect(getActiveRect(), mDotRadius, mDotRadius, mPaginationPaint); } } } + /** + * Draws the page indicator, denoting the currently selected page + * + * @param canvas is used to draw the page indicator and to rotate it as we scroll + * @param scale is used to set the scale of our canvas + */ + private void drawPageIndicator(Canvas canvas, float scale) { + RectF currRect = getActiveRect(); + + // saves the canvas so we can later restore it to its original scale + canvas.save(); + + // Moves the canvas to start at the top left corner of the page indicator + canvas.translate(currRect.left, currRect.top); + + // Scales the canvas in place to animate the indicator on entry + canvas.scale(scale, scale, mPageIndicatorRadius, mPageIndicatorRadius); + + int scrollPerPage = getScrollPerPage(); + // This IF is to avoid division by 0 + if (scrollPerPage != 0) { + int delta = mCurrentScroll % scrollPerPage; + canvas.rotate((INDICATOR_ROTATION * delta) / scrollPerPage, + mPageIndicatorRadius, mPageIndicatorRadius); + } + + mPageIndicatorDrawable.draw(canvas); + canvas.restore(); + } + /** * Returns the radius of the circle based on how close the page indicator is to it * From 978b0021a9ab988c775016d2c1c77357339b62bd Mon Sep 17 00:00:00 2001 From: Jeremy Sim Date: Thu, 29 Sep 2022 21:15:05 -0700 Subject: [PATCH 2/2] Fix 2 bugs involving split staging task translation This patch fixes two bugs related to the way tiles slide in when a split is staged. Previously, translations were not being completely reset, so on repeated splits, the thumbnails would retain their old translation setting and cause awkward movements to occur during the slide-in animation. Fixed by adding setTaskViewsPrimarySplitTranslation() and setTaskViewsSecondarySplitTranslation() in resetFromSplitSelectionState(). Fixes: 249154347 Fixes: 249824716 Test: Manual on grid and non-grid Overview, in a variety of conditions Change-Id: I2d9aa621a17f178ff8216740d76429d2ac484b39 --- .../launcher3/uioverrides/RecentsViewStateController.java | 3 ++- .../com/android/quickstep/util/OverviewToSplitTimings.java | 7 +++++-- .../quickstep/util/PhoneOverviewToSplitTimings.java | 3 --- .../quickstep/util/TabletOverviewToSplitTimings.java | 3 --- quickstep/src/com/android/quickstep/views/RecentsView.java | 7 +++++++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java index cbb9ad18f2..910b99b36a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java @@ -130,10 +130,11 @@ public final class RecentsViewStateController extends mRecentsView.createSplitSelectInitAnimation(builder, toState.getTransitionDuration(mLauncher, true /* isToState */)); - // Add properties to shift remaining taskViews to get out of placeholder view + // Shift tasks vertically downward to get out of placeholder view builder.setFloat(mRecentsView, taskViewsFloat.first, toState.getSplitSelectTranslation(mLauncher), timings.getGridSlidePrimaryInterpolator()); + // Zero out horizontal translation builder.setFloat(mRecentsView, taskViewsFloat.second, 0, timings.getGridSlideSecondaryInterpolator()); diff --git a/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java b/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java index d46c0f80a0..e189a66ee4 100644 --- a/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java +++ b/quickstep/src/com/android/quickstep/util/OverviewToSplitTimings.java @@ -16,6 +16,9 @@ package com.android.quickstep.util; +import static com.android.launcher3.anim.Interpolators.EMPHASIZED; +import static com.android.launcher3.anim.Interpolators.INSTANT; + import android.view.animation.Interpolator; /** @@ -44,14 +47,14 @@ abstract class OverviewToSplitTimings implements SplitAnimationTimings { public int getInstructionsTextFadeInEnd() { return 300; } public int getInstructionsUnfoldStart() { return 167; } public int getInstructionsUnfoldEnd() { return 500; } + public Interpolator getGridSlidePrimaryInterpolator() { return EMPHASIZED; } + public Interpolator getGridSlideSecondaryInterpolator() { return INSTANT; } abstract public int getDuration(); abstract public Interpolator getStagedRectXInterpolator(); abstract public Interpolator getStagedRectYInterpolator(); abstract public Interpolator getStagedRectScaleXInterpolator(); abstract public Interpolator getStagedRectScaleYInterpolator(); - abstract public Interpolator getGridSlidePrimaryInterpolator(); - abstract public Interpolator getGridSlideSecondaryInterpolator(); public float getGridSlideStartOffset() { return (float) getGridSlideStart() / getDuration(); diff --git a/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java b/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java index 66c41d6ab1..f1dde53d12 100644 --- a/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java +++ b/quickstep/src/com/android/quickstep/util/PhoneOverviewToSplitTimings.java @@ -17,7 +17,6 @@ package com.android.quickstep.util; import static com.android.launcher3.anim.Interpolators.EMPHASIZED; -import static com.android.launcher3.anim.Interpolators.INSTANT; import android.view.animation.Interpolator; @@ -41,6 +40,4 @@ public class PhoneOverviewToSplitTimings public Interpolator getStagedRectYInterpolator() { return EMPHASIZED; } public Interpolator getStagedRectScaleXInterpolator() { return EMPHASIZED; } public Interpolator getStagedRectScaleYInterpolator() { return EMPHASIZED; } - public Interpolator getGridSlidePrimaryInterpolator() { return EMPHASIZED; } - public Interpolator getGridSlideSecondaryInterpolator() { return INSTANT; } } diff --git a/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java b/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java index 30defa7cf2..cbf46bfcb8 100644 --- a/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java +++ b/quickstep/src/com/android/quickstep/util/TabletOverviewToSplitTimings.java @@ -17,7 +17,6 @@ package com.android.quickstep.util; import static com.android.launcher3.anim.Interpolators.DEACCEL_2; -import static com.android.launcher3.anim.Interpolators.LINEAR; import android.view.animation.Interpolator; @@ -41,6 +40,4 @@ public class TabletOverviewToSplitTimings public Interpolator getStagedRectYInterpolator() { return DEACCEL_2; } public Interpolator getStagedRectScaleXInterpolator() { return DEACCEL_2; } public Interpolator getStagedRectScaleYInterpolator() { return DEACCEL_2; } - public Interpolator getGridSlidePrimaryInterpolator() { return LINEAR; } - public Interpolator getGridSlideSecondaryInterpolator() { return LINEAR; } } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 2f91e16566..7ad0e48ccb 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -3115,6 +3115,7 @@ public abstract class RecentsView