From 2b3ce44c6273c5f09a4f003fcc231e6fd8ab6d8a Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Thu, 22 Aug 2024 12:52:07 +0530
Subject: [PATCH] Revert "drawable: Tint colors directly instead of relying on
 system theme"

This reverts commit 70413f14250ebfacf2d4e017a05da2ef8760a21d.
---
 app/src/main/res/drawable/ic_app_settings.xml | 2 +-
 app/src/main/res/drawable/ic_call.xml         | 2 +-
 app/src/main/res/drawable/ic_contacts.xml     | 2 +-
 app/src/main/res/drawable/ic_message.xml      | 2 +-
 app/src/main/res/drawable/ic_settings.xml     | 2 +-
 app/src/main/res/values/colors.xml            | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/drawable/ic_app_settings.xml b/app/src/main/res/drawable/ic_app_settings.xml
index 567eb6679..be2e27efe 100644
--- a/app/src/main/res/drawable/ic_app_settings.xml
+++ b/app/src/main/res/drawable/ic_app_settings.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/accent_primary"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml
index 8d9dfc5d3..b67ffd6bf 100644
--- a/app/src/main/res/drawable/ic_call.xml
+++ b/app/src/main/res/drawable/ic_call.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/accent_primary"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_contacts.xml b/app/src/main/res/drawable/ic_contacts.xml
index 2560c8759..cf0bae423 100644
--- a/app/src/main/res/drawable/ic_contacts.xml
+++ b/app/src/main/res/drawable/ic_contacts.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/accent_primary"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
index e325e6327..677c3b49c 100644
--- a/app/src/main/res/drawable/ic_message.xml
+++ b/app/src/main/res/drawable/ic_message.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/accent_primary"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 697ef2112..335c6a761 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/accent_primary"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77b9a59bf..8e3ce57f6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,8 +10,8 @@
     <!-- https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-14.0.0_r1/core/res/res/values/colors_device_defaults.xml#52 -->
     <color name="background">@android:color/system_neutral1_50</color>
     <!-- https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-14.0.0_r1/core/res/res/values/colors_device_defaults.xml#69 -->
-    <!-- private resource, access it directly -->
-    <color name="red">#ff7043</color>
+    <!-- private resource, access it from colorError attribute instead -->
+    <color name="red">@*android:color/error_color_device_default_dark</color>
     <!-- https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-14.0.0_r1/core/res/res/values/colors_device_defaults.xml#35 -->
     <color name="ic_launcher_background">@color/accent_primary</color>