PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename alpha and refactor the way alpha is set in PageIndicator am: cdadbaa225

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20010024

Change-Id: I233cc6a35ee4ac7d3f3b0d3f8339479e0dd1e15c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Federico Baron
2022-09-26 17:45:27 +00:00
committed by Automerger Merge Worker
parent a98e89ac30 cdadbaa225
commit b5ed62b8fc
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/pageindicators/PageIndicatorDots.java
+7 -6
View File
@@ -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();