From 5bd2f1bbded7eacf03b0572712b57527d3602f2c Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Mon, 3 Jul 2023 17:49:41 +0600
Subject: [PATCH] 1317-s-Fix_icon_color_issue

issue: https://gitlab.e.foundation/e/os/backlog/-/issues/1317
---
 res/drawable/quantum_ic_done_vd_theme_24.xml               | 3 +--
 res/values/colors.xml                                      | 4 ++--
 res/values/styles.xml                                      | 7 +++++++
 src/com/android/contacts/SimImportService.java             | 3 ---
 .../contacts/vcard/NotificationImportExportListener.java   | 4 ----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/res/drawable/quantum_ic_done_vd_theme_24.xml b/res/drawable/quantum_ic_done_vd_theme_24.xml
index 0c810e80e4..80381f566d 100644
--- a/res/drawable/quantum_ic_done_vd_theme_24.xml
+++ b/res/drawable/quantum_ic_done_vd_theme_24.xml
@@ -18,8 +18,7 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 51eb19d11d..33054dd6f3 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,7 +28,7 @@
     <color name="quickcontact_entry_sub_header_text_color">@color/e_secondary_text_color</color>
     <color name="quickcontact_entry_header_text_color">#202020</color>
 
-    <color name="action_bar_background">#2a56c6</color>
+    <color name="action_bar_background">@color/e_accent</color>
 
     <color name="nav_item_selected_background">#0f000000</color>
 
@@ -108,7 +108,7 @@
     <color name="people_app_theme_color">#363636</color>
 
     <!-- Color of the theme of the Dialer app -->
-    <color name="dialtacts_theme_color">#2a56c6</color>
+    <color name="dialtacts_theme_color">@color/e_accent</color>
 
     <!-- Color of image view placeholder. -->
     <color name="image_placeholder">#DDDDDD</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 64b5af0a61..ccf9cc07a5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -37,6 +37,7 @@
         <item name="android:actionBarItemBackground">
             @drawable/item_background_material_borderless_dark
         </item>
+        <item name="android:actionOverflowButtonStyle">@style/QuickContactsActionBarOverflowQP</item>
     </style>
 
     <style name="PeopleTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
@@ -262,6 +263,12 @@
         <item name="android:tint">@color/action_bar_button_text_color</item>
     </style>
 
+    <style name="QuickContactsActionBarOverflowQP"
+        parent="Widget.AppCompat.Light.ActionButton.Overflow">
+        <item name="android:src">@drawable/quantum_ic_more_vert_vd_theme_24</item>
+        <item name="android:tint">@android:color/white</item>
+    </style>
+
     <!-- Toolbar navigation button. -->
     <style name="ContactToolbarNavigationButtonStyle" parent="@style/Widget.AppCompat.Toolbar.Button.Navigation">
         <item name="android:tint">@color/action_bar_button_text_color</item>
diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java
index f6703fc0d1..4c639103db 100644
--- a/src/com/android/contacts/SimImportService.java
+++ b/src/com/android/contacts/SimImportService.java
@@ -196,7 +196,6 @@ public class SimImportService extends Service {
         builder.setOngoing(false)
                 .setAutoCancel(true)
                 .setContentTitle(this.getString(R.string.importing_sim_finished_title))
-                .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(R.drawable.quantum_ic_done_vd_theme_24)
                 .setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE));
         return builder.build();
@@ -210,7 +209,6 @@ public class SimImportService extends Service {
                 .setAutoCancel(true)
                 .setContentTitle(this.getString(R.string.importing_sim_failed_title))
                 .setContentText(this.getString(R.string.importing_sim_failed_message))
-                .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(R.drawable.quantum_ic_error_vd_theme_24)
                 .setContentIntent(PendingIntent.getActivity(this, 0, intent, FLAG_IMMUTABLE));
         return builder.build();
@@ -223,7 +221,6 @@ public class SimImportService extends Service {
         builder.setOngoing(true)
                 .setProgress(/* current */ 0, /* max */ 100, /* indeterminate */ true)
                 .setContentTitle(description)
-                .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(android.R.drawable.stat_sys_download);
         return builder.build();
     }
diff --git a/src/com/android/contacts/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java
index 3b4dc5e57c..91d66b4b95 100755
--- a/src/com/android/contacts/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -226,7 +226,6 @@ public class NotificationImportExportListener implements VCardImportExportListen
                 .setProgress(totalCount, currentCount, totalCount == - 1)
                 .setTicker(tickerText)
                 .setContentTitle(description)
-                .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(type == VCardService.TYPE_IMPORT
                         ? android.R.drawable.stat_sys_download
                         : android.R.drawable.stat_sys_upload)
@@ -252,7 +251,6 @@ public class NotificationImportExportListener implements VCardImportExportListen
                 ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)
                 .setSmallIcon(android.R.drawable.stat_notify_error)
-                .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))
                 .setContentTitle(description)
                 .setContentText(description)
                 .build();
@@ -271,7 +269,6 @@ public class NotificationImportExportListener implements VCardImportExportListen
         return new NotificationCompat.Builder(context,
             ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
             .setAutoCancel(true)
-            .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))
             .setSmallIcon(R.drawable.quantum_ic_done_vd_theme_24)
             .setContentTitle(title)
             .setContentText(description)
@@ -291,7 +288,6 @@ public class NotificationImportExportListener implements VCardImportExportListen
         return new NotificationCompat.Builder(context,
                 ContactsNotificationChannelsUtil.DEFAULT_CHANNEL)
                 .setAutoCancel(true)
-                .setColor(context.getResources().getColor(R.color.dialtacts_theme_color))
                 .setSmallIcon(android.R.drawable.stat_notify_error)
                 .setContentTitle(context.getString(R.string.vcard_import_failed))
                 .setContentText(reason)
-- 
GitLab