From 18ef04fe0eeaa537fbc287deeb82092bb1400b3c Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 30 Apr 2019 18:11:34 -0700
Subject: [PATCH] Use theme attributes for dual tone icons

Partial revert of ag/4862272

Fixes: 130621434
Test: look at status bar with dark theme on and off
Test: look at status bar with light or dark wallpaper
Change-Id: Ifde5c27241bfe2f7bc0350e99fc090914beef2a0
---
 .../res/color/dark_mode_icon_color_dual_tone_background.xml     | 2 +-
 .../res/color/dark_mode_icon_color_dual_tone_fill.xml           | 2 +-
 .../res/color/light_mode_icon_color_dual_tone_background.xml    | 2 +-
 .../res/color/light_mode_icon_color_dual_tone_fill.xml          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_background.xml b/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_background.xml
index 6b45a479836e4..c8a80ac57c000 100644
--- a/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_background.xml
+++ b/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_background.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.24" android:color="@android:color/black" />
+    <item android:alpha="0.24" android:color="?android:attr/colorBackground" />
 </selector>
\ No newline at end of file
diff --git a/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_fill.xml b/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_fill.xml
index 5ef085b32dd65..8dcfdbb8cf1e5 100644
--- a/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_fill.xml
+++ b/packages/SettingsLib/res/color/dark_mode_icon_color_dual_tone_fill.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.47" android:color="@android:color/black" />
+    <item android:alpha="0.47" android:color="?android:attr/colorBackground" />
 </selector>
\ No newline at end of file
diff --git a/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_background.xml b/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_background.xml
index 81f63a48fb9ab..34de5489a28bf 100644
--- a/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_background.xml
+++ b/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_background.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.3" android:color="@android:color/white" />
+    <item android:alpha="0.3" android:color="?android:attr/colorForeground" />
 </selector>
\ No newline at end of file
diff --git a/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_fill.xml b/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_fill.xml
index 61f4e26cf00b0..15944c3a2a07a 100644
--- a/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_fill.xml
+++ b/packages/SettingsLib/res/color/light_mode_icon_color_dual_tone_fill.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/white" />
+    <item android:color="?android:attr/colorForeground" />
 </selector>
\ No newline at end of file