diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index c2ebeffe66..55cedf45fa 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -41,6 +41,8 @@
@android:color/system_neutral1_900
@android:color/system_accent2_50
+ @android:color/system_accent1_600
+ @android:color/system_accent2_100
@android:color/system_accent1_600
@android:color/system_neutral1_100
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 00cf31c65c..c05016d8a4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -42,6 +42,7 @@
+
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1b68fb68a7..cc5c5a39d3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -73,6 +73,8 @@
#464746
?attr/colorPrimary
+ #ff006c5f
+ #ffbfebe3
#FFFFFFFF
#FFFFFFFF
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b7661b9798..8ad4fcdb97 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -50,6 +50,7 @@
- @drawable/workspace_bg
- @style/WidgetContainerTheme
- @color/folder_dot_color
+ - @color/folder_pagination_color_light
- @color/folder_background_light
- ?android:attr/colorPrimary
- @color/workspace_text_color_dark
@@ -108,6 +109,7 @@
- @color/popup_shade_third_dark
- @style/WidgetContainerTheme.Dark
- @color/folder_dot_color
+ - @color/folder_pagination_color_dark
- @color/folder_background_dark
- ?android:attr/colorPrimary
- @color/workspace_text_color_light
diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
index f7c730a6c5..29eefe2a03 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
@@ -53,6 +53,9 @@ 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;
+
// This value approximately overshoots to 1.5 times the original size.
private static final float ENTER_ANIMATION_OVERSHOOT_TENSION = 4.9f;
@@ -75,8 +78,6 @@ public class PageIndicatorDots extends View implements PageIndicator {
private final Paint mCirclePaint;
private final float mDotRadius;
- private final int mActiveColor;
- private final int mInActiveColor;
private final boolean mIsRtl;
private int mNumPages;
@@ -110,12 +111,10 @@ public class PageIndicatorDots extends View implements PageIndicator {
mCirclePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mCirclePaint.setStyle(Style.FILL);
+ mCirclePaint.setColor(Themes.getAttrColor(context, R.attr.folderPaginationColor));
mDotRadius = getResources().getDimension(R.dimen.page_indicator_dot_size) / 2;
setOutlineProvider(new MyOutlineProver());
- mActiveColor = Themes.getColorAccent(context);
- mInActiveColor = Themes.getAttrColor(context, android.R.attr.colorControlHighlight);
-
mIsRtl = Utilities.isRtl(getResources());
}
@@ -253,18 +252,18 @@ public class PageIndicatorDots extends View implements PageIndicator {
circleGap = -circleGap;
}
for (int i = 0; i < mEntryAnimationRadiusFactors.length; i++) {
- mCirclePaint.setColor(i == mActivePage ? mActiveColor : mInActiveColor);
+ mCirclePaint.setAlpha(i == mActivePage ? DOT_ACTIVE_ALPHA : DOT_INACTIVE_ALPHA);
canvas.drawCircle(x, y, mDotRadius * mEntryAnimationRadiusFactors[i], mCirclePaint);
x += circleGap;
}
} else {
- mCirclePaint.setColor(mInActiveColor);
+ mCirclePaint.setAlpha(DOT_INACTIVE_ALPHA);
for (int i = 0; i < mNumPages; i++) {
canvas.drawCircle(x, y, mDotRadius, mCirclePaint);
x += circleGap;
}
- mCirclePaint.setColor(mActiveColor);
+ mCirclePaint.setAlpha(DOT_ACTIVE_ALPHA);
canvas.drawRoundRect(getActiveRect(), mDotRadius, mDotRadius, mCirclePaint);
}
}