Apply correct styles to account filter activities on tablets
We use dialtacts_theme_color defined in ContactsCommon to ensure that
both Contacts and Dialer work well.
In addition, ag/808228 checked the "Customize" filter on click to enable
Talkback. We may need to uncheck it when user presses "Cancel" on
CustomContactListFilterActivity, to avoid 2 filters being checked at the
same time. This error doesn't occur on phones, and occurs only on tablets.
Bug: 26439461
Bug: 25629359
Change-Id: Idc31eb1abd55fd2468c85a6671eb6317092d7017
diff --git a/res-common/values-sw600dp/styles.xml b/res-common/values-sw600dp/styles.xml
index 2130ce1..2550683 100644
--- a/res-common/values-sw600dp/styles.xml
+++ b/res-common/values-sw600dp/styles.xml
@@ -15,9 +15,12 @@
-->
<resources>
- <style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light.Dialog">
+ <style name="ContactListFilterTheme" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowCloseOnTouchOutside">true</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
+ <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+ <item name="colorAccent">@color/dialtacts_theme_color</item>
</style>
<style name="CustomContactListFilterView" parent="ContactListFilterTheme">
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 77c4677..aa52220 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -69,8 +69,11 @@
<item name="android:overScrollMode">always</item>
</style>
- <style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light">
+ <style name="ContactListFilterTheme" parent="Theme.AppCompat.Light">
<item name="android:listViewStyle">@style/ListViewStyle</item>
+ <!-- Styles that require AppCompat compatibility, remember to update both sets -->
+ <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+ <item name="colorAccent">@color/dialtacts_theme_color</item>
</style>
<style name="CustomContactListFilterView" parent="ContactListFilterTheme">