summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav Vashi <neobuddy89@gmail.com>2022-08-06 01:37:02 +0530
committerSemavi Ulusoy <doc.divxm@gmail.com>2022-09-13 10:47:53 +0300
commite3881523473e5516bb0de8a0e6c7de7eb014781d (patch)
treee1b89060df6c7a6495619f16fbc29b166acf4d1c
parent4a1df426da8a64386f606958ae42873c552cc8f6 (diff)
Dialer: Always use Material You gradient for incall UI
* Disregard using sim highlight color, looks awful. Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Change-Id: I8272a2efbcdcb5b065e67b6e50b74946fc3e94a0
-rw-r--r--java/com/android/incallui/ThemeColorManager.java13
-rw-r--r--java/com/android/incallui/theme/res/values/colors.xml8
2 files changed, 4 insertions, 17 deletions
diff --git a/java/com/android/incallui/ThemeColorManager.java b/java/com/android/incallui/ThemeColorManager.java
index 1d4c287be..f6b69ceaf 100644
--- a/java/com/android/incallui/ThemeColorManager.java
+++ b/java/com/android/incallui/ThemeColorManager.java
@@ -81,14 +81,6 @@ public class ThemeColorManager {
backgroundColorMiddle = context.getColor(R.color.incall_background_gradient_middle);
backgroundColorBottom = context.getColor(R.color.incall_background_gradient_bottom);
backgroundColorSolid = context.getColor(R.color.incall_background_multiwindow);
- if (highlightColor != PhoneAccount.NO_HIGHLIGHT_COLOR) {
- // The default background gradient has a subtle alpha. We grab that alpha and apply it to
- // the phone account color.
- backgroundColorTop = applyAlpha(palette.mPrimaryColor, backgroundColorTop);
- backgroundColorMiddle = applyAlpha(palette.mPrimaryColor, backgroundColorMiddle);
- backgroundColorBottom = applyAlpha(palette.mPrimaryColor, backgroundColorBottom);
- backgroundColorSolid = applyAlpha(palette.mPrimaryColor, backgroundColorSolid);
- }
}
primaryColor = palette.mPrimaryColor;
@@ -135,9 +127,4 @@ public class ThemeColorManager {
public int getBackgroundColorSolid() {
return backgroundColorSolid;
}
-
- @ColorInt
- private static int applyAlpha(@ColorInt int color, @ColorInt int sourceColorWithAlpha) {
- return ColorUtils.setAlphaComponent(color, Color.alpha(sourceColorWithAlpha));
- }
}
diff --git a/java/com/android/incallui/theme/res/values/colors.xml b/java/com/android/incallui/theme/res/values/colors.xml
index 059fe59a9..d05df686e 100644
--- a/java/com/android/incallui/theme/res/values/colors.xml
+++ b/java/com/android/incallui/theme/res/values/colors.xml
@@ -53,11 +53,11 @@
<item>#841F10</item>
</array>
- <color name="incall_background_gradient_top">#E91141BB</color>
- <color name="incall_background_gradient_middle">#E91141BB</color>
- <color name="incall_background_gradient_bottom">#CC229FEB</color>
+ <color name="incall_background_gradient_top">@*android:color/system_accent1_600</color>
+ <color name="incall_background_gradient_middle">@*android:color/system_accent1_500</color>
+ <color name="incall_background_gradient_bottom">@*android:color/system_accent1_400</color>
- <color name="incall_background_multiwindow">#E91141BB</color>
+ <color name="incall_background_multiwindow">@*android:color/system_accent1_500</color>
<color name="incall_background_gradient_spam_top">#E5A30B0B</color>
<color name="incall_background_gradient_spam_middle">#D6C01111</color>