From 70e5dd6ea0858ba69b2fc451d450871d0f1dac42 Mon Sep 17 00:00:00 2001
From: Seweryn Fornalik <s3w3ryn@e.email>
Date: Tue, 8 Jun 2021 12:05:18 +0200
Subject: [PATCH 1/2] Change background color of dismiss and snooze screens

---
 res/values/colors.xml                               | 3 +++
 src/com/android/deskclock/alarms/AlarmActivity.java | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index c38a75471..f539ca1bb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,6 +35,9 @@
 
     <color name="default_background">#1D1D1D</color>
 
+    <color name="color_red">#FF0000</color>
+    <color name="color_blue_light">#68C3FC</color>
+
     <!-- shadowColor for widget text -->
     <color name="widget_shadow_color">#000000</color>
 
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index 88632c77a..f9e57f232 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -487,6 +487,8 @@ public class AlarmActivity extends BaseActivity
         LOGGER.v("Snoozed: %s", mAlarmInstance);
 
         final int colorAccent = ThemeUtils.resolveColor(this, R.attr.colorAccent);
+        final int colorRed = ThemeUtils.resolveColor(this, R.color.color_red);
+
         setAnimatedFractions(1.0f /* snoozeFraction */, 0.0f /* dismissFraction */);
 
         final int snoozeMinutes = DataModel.getDataModel().getSnoozeLength();
@@ -496,7 +498,7 @@ public class AlarmActivity extends BaseActivity
                 R.plurals.alarm_alert_snooze_set, snoozeMinutes, snoozeMinutes);
 
         getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text, infoText,
-                accessibilityText, colorAccent, colorAccent).start();
+                accessibilityText, colorAccent, colorRed).start();
 
         AlarmStateManager.setSnoozeState(this, mAlarmInstance, false /* showToast */);
 
@@ -513,11 +515,13 @@ public class AlarmActivity extends BaseActivity
         mAlarmHandled = true;
         LOGGER.v("Dismissed: %s", mAlarmInstance);
 
+        final int colorBlueLight = ThemeUtils.resolveColor(this, R.color.color_blue_light);
+
         setAnimatedFractions(0.0f /* snoozeFraction */, 1.0f /* dismissFraction */);
 
         getAlertAnimator(mDismissButton, R.string.alarm_alert_off_text, null /* infoText */,
                 getString(R.string.alarm_alert_off_text) /* accessibilityText */,
-                Color.WHITE, mCurrentHourColor).start();
+                Color.WHITE, colorBlueLight).start();
 
         AlarmStateManager.deleteInstanceAndUpdateParent(this, mAlarmInstance);
 
-- 
GitLab


From ca3941c5b5df19fc10bbd855e606ab77b5e5654a Mon Sep 17 00:00:00 2001
From: Seweryn Fornalik <s3w3ryn@e.email>
Date: Wed, 9 Jun 2021 14:12:37 +0200
Subject: [PATCH 2/2] Changes after review

---
 res/values/colors.xml                               | 4 +---
 src/com/android/deskclock/alarms/AlarmActivity.java | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/values/colors.xml b/res/values/colors.xml
index f539ca1bb..1900071eb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,9 +35,6 @@
 
     <color name="default_background">#1D1D1D</color>
 
-    <color name="color_red">#FF0000</color>
-    <color name="color_blue_light">#68C3FC</color>
-
     <!-- shadowColor for widget text -->
     <color name="widget_shadow_color">#000000</color>
 
@@ -46,6 +43,7 @@
     <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
     <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
     <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_red1">@lineageos.platform:color/color_default_red1</color>
 
 
 
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index f9e57f232..3b90569cb 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -487,7 +487,7 @@ public class AlarmActivity extends BaseActivity
         LOGGER.v("Snoozed: %s", mAlarmInstance);
 
         final int colorAccent = ThemeUtils.resolveColor(this, R.attr.colorAccent);
-        final int colorRed = ThemeUtils.resolveColor(this, R.color.color_red);
+        final int colorRed = ThemeUtils.resolveColor(this, R.color.color_default_red1);
 
         setAnimatedFractions(1.0f /* snoozeFraction */, 0.0f /* dismissFraction */);
 
@@ -515,7 +515,7 @@ public class AlarmActivity extends BaseActivity
         mAlarmHandled = true;
         LOGGER.v("Dismissed: %s", mAlarmInstance);
 
-        final int colorBlueLight = ThemeUtils.resolveColor(this, R.color.color_blue_light);
+        final int colorBlueLight = ThemeUtils.resolveColor(this, R.color.color_default_blue1);
 
         setAnimatedFractions(0.0f /* snoozeFraction */, 1.0f /* dismissFraction */);
 
-- 
GitLab