commit bdcc17c2aa4e5243601b5789b8988e62955b05ac
author Federico Baron <fbaron@google.com> Mon Sep 19 13:53:32 2022 -0700
committer Federico Baron <fbaron@google.com> Fri Sep 23 11:30:00 2022 -0700
tree 6979005b5159fcbbd4d30c04f21cb6abf4ad0ce6
parent 7f98856395a8c51fe2deda861154e67dd4647a89

Add rotation to folder pagination for delightful pagination

Here we add rotation for the page indicator in order to make it align with the new animation design.

Bug: 247561880
Test: manual
Change-Id: I91202c8ac259d4876f6182938db79c466f99c6ed

src/com/android/launcher3/pageindicators/PageIndicatorDots.java

diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
index 1798536..439e1c7 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
@@ -59,10 +59,13 @@
     private static final int DOT_ACTIVE_ALPHA = 255;
     private static final int DOT_INACTIVE_ALPHA = 128;
     private static final int DOT_GAP_FACTOR = 3;
+    private static final float DOT_GAP_FACTOR_FLOAT = 3.8f;
 
     // This value approximately overshoots to 1.5 times the original size.
     private static final float ENTER_ANIMATION_OVERSHOOT_TENSION = 4.9f;
 
+    private static final float INDICATOR_ROTATION = 180f;
+
     private static final RectF sTempRect = new RectF();
 
     private static final Property<PageIndicatorDots, Float> CURRENT_POSITION
@@ -121,7 +124,12 @@
         mPaginationPaint.setStyle(Style.FILL);
         mPaginationPaint.setColor(Themes.getAttrColor(context, R.attr.folderPaginationColor));
         mDotRadius = getResources().getDimension(R.dimen.page_indicator_dot_size) / 2;
-        mCircleGap = DOT_GAP_FACTOR * mDotRadius;
+
+        if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) {
+            mCircleGap = DOT_GAP_FACTOR_FLOAT * mDotRadius;
+        } else {
+            mCircleGap = DOT_GAP_FACTOR * mDotRadius;
+        }
         mPageIndicatorSize = getResources().getDimension(
                 R.dimen.page_indicator_current_page_indicator_size);
         if (!SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) {
@@ -298,7 +306,17 @@
             mPaginationPaint.setAlpha(DOT_ACTIVE_ALPHA);
 
             if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) {
-                canvas.drawRect(getActiveRect(), mPaginationPaint);
+                RectF currRect = getActiveRect();
+                int scrollPerPage = getScrollPerPage();
+
+                // This IF is to avoid division by 0
+                if (scrollPerPage != 0) {
+                    int delta = mCurrentScroll % scrollPerPage;
+                    canvas.rotate((INDICATOR_ROTATION * delta) / scrollPerPage,
+                            currRect.centerX(), currRect.centerY());
+                }
+
+                canvas.drawRect(currRect, mPaginationPaint);
             } else {
                 canvas.drawRoundRect(getActiveRect(), mDotRadius, mDotRadius, mPaginationPaint);
             }
@@ -376,10 +394,17 @@
     }
 
     /**
+     * Returns an int that is the amount we need to scroll per page
+     */
+    private int getScrollPerPage() {
+        return mNumPages > 1 ? mTotalScroll / (mNumPages - 1) : 0;
+    }
+
+    /**
      * The current scroll adjusted for the distance the indicator needs to travel on the screen
      */
     private float getIndicatorScrollDistance() {
-        float scrollPerPage = mNumPages > 1 ? mTotalScroll / (mNumPages - 1) : 0;
+        int scrollPerPage = getScrollPerPage();
         return scrollPerPage != 0 ? ((float) mCurrentScroll / scrollPerPage) * mCircleGap : 0;
     }