From cdadbaa2253ef9b36cb0a9a4b08a8e0a13401a1b Mon Sep 17 00:00:00 2001 From: Federico Baron Date: Wed, 21 Sep 2022 12:50:18 -0700 Subject: [PATCH] Rename alpha and refactor the way alpha is set in PageIndicator Here we rename DOT_INACTIVE_ALPHA and DOT_ACTIVE_ALPHA to reflect the new code, and we also use mPaginationPaint.setAlpha a bit differently Bug: 247561880 Test: Manual Change-Id: I5ee25ee3fb36715d54f9ed86c0d59448829d7260 --- .../launcher3/pageindicators/PageIndicatorDots.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java index 439e1c7a45..fb51bf01a7 100644 --- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java +++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java @@ -56,8 +56,8 @@ public class PageIndicatorDots extends View implements PageIndicator { private static final int ENTER_ANIMATION_STAGGERED_DELAY = 150; private static final int ENTER_ANIMATION_DURATION = 400; - private static final int DOT_ACTIVE_ALPHA = 255; - private static final int DOT_INACTIVE_ALPHA = 128; + private static final int PAGE_INDICATOR_ALPHA = 255; + private static final int DOT_ALPHA = 128; private static final int DOT_GAP_FACTOR = 3; private static final float DOT_GAP_FACTOR_FLOAT = 3.8f; @@ -282,7 +282,7 @@ public class PageIndicatorDots extends View implements PageIndicator { circleGap = -circleGap; } for (int i = 0; i < mEntryAnimationRadiusFactors.length; i++) { - mPaginationPaint.setAlpha(i == mActivePage ? DOT_ACTIVE_ALPHA : DOT_INACTIVE_ALPHA); + mPaginationPaint.setAlpha(i == mActivePage ? PAGE_INDICATOR_ALPHA : DOT_ALPHA); if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { canvas.drawCircle(x, y, getRadius(x) * mEntryAnimationRadiusFactors[i], mPaginationPaint); @@ -293,7 +293,8 @@ public class PageIndicatorDots extends View implements PageIndicator { x += circleGap; } } else { - mPaginationPaint.setAlpha(DOT_INACTIVE_ALPHA); + // Here we draw the dots + mPaginationPaint.setAlpha(DOT_ALPHA); for (int i = 0; i < mNumPages; i++) { if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { canvas.drawCircle(x, y, getRadius(x), mPaginationPaint); @@ -303,8 +304,8 @@ public class PageIndicatorDots extends View implements PageIndicator { x += circleGap; } - mPaginationPaint.setAlpha(DOT_ACTIVE_ALPHA); - + // Here we draw the current page indicator + mPaginationPaint.setAlpha(PAGE_INDICATOR_ALPHA); if (SHOW_DELIGHTFUL_PAGINATION_FOLDER.get()) { RectF currRect = getActiveRect(); int scrollPerPage = getScrollPerPage();