Revert "drawable: Tint colors directly instead of relying on system t…

…heme" This reverts commit 70413f1.
seedvault-app · Aug 22, 2024 · 2b3ce44 · 2b3ce44
1 parent b1f6fcb
commit 2b3ce44
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>