Use ?android:attr/textColorPrimary where possible
Currently Dialer uses hardcoded colors, which don't work
well when the OEM wants to switch to a light theme.
Bug: 167443831
Test: Manually
Change-Id: I7966b357a1be36571a3d27ce3fb4f8a0076765c6
diff --git a/res/color/primary_text_selector.xml b/res/color/primary_text_selector.xml
deleted file mode 100644
index b6c837c..0000000
--- a/res/color/primary_text_selector.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- Copyright (C) 2019 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/primary_text_color"
- android:state_enabled="true"/>
- <item android:color="@color/secondary_text_color"
- android:state_enabled="false"/>
-</selector>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a7c24a3..b34518b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -75,10 +75,10 @@
<!-- In-call styling for everything except short landscape screens -->
<style name="TextAppearance.InCallUserTitle" parent="TextAppearance.Display2"/>
<style name="TextAppearance.InCallUserPhoneNumber" parent="TextAppearance.Body1">
- <item name="android:textColor">#B8FFFFFF</item>
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.InCallState" parent="TextAppearance.Body1">
- <item name="android:textColor">#B8FFFFFF</item>
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<!-- Call history -->
@@ -86,7 +86,7 @@
<!-- Customized text color for missed calls can be added here -->
<style name="TextAppearance.CallLogTitleMissedCall" parent="TextAppearance.Body1"/>
<style name="TextAppearance.CallLogSubtitle" parent="TextAppearance.Body3">
- <item name="android:textColor">@color/secondary_text_color</item>
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.CallLogCallCountDefault" parent="TextAppearance.CallLogSubtitle"/>
<!-- Customized text color for missed calls can be added here -->
@@ -99,7 +99,7 @@
<style name="TextAppearance.ContactDetailsTitle" parent="TextAppearance.Display2"/>
<style name="TextAppearance.ContactDetailsListTitle" parent="TextAppearance.Body1"/>
<style name="TextAppearance.ContactDetailsListSubtitle" parent="TextAppearance.Body3">
- <item name="android:textColor">@color/secondary_text_color</item>
+ <item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.DefaultNumberLabel" parent="TextAppearance.Body3">
<item name="android:textColor">@*android:color/accent_device_default_light</item>
@@ -107,15 +107,15 @@
<!-- Contact results -->
<style name="TextAppearance.ContactResultTitle" parent="TextAppearance.Body1">
- <item name="android:textColor">@color/primary_text_selector</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<!-- Add to favorite flow dialog -->
<style name="TextAppearance.AddFavoriteNumberTitle" parent="TextAppearance.Body1">
- <item name="android:textColor">@color/primary_text_selector</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="TextAppearance.AddFavoriteNumberSubtitle" parent="TextAppearance.Body3">
- <item name="android:textColor">@color/primary_text_selector</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<!-- Subheader -->
