Remove AppCompat library from Contacts (2/3)
* CL was prepared by running the following:
git revert --no-commit 52c1a302f933cf14b93e7a5e14426eec44d67953 # https://googleplex-android-review.git.corp.google.com/#/c/842208/
git revert --no-commit 6497a0d3a9cf5f0dafb04a4b5192996c8840afc3 # https://googleplex-android-review.git.corp.google.com/#/c/841415/
git revert --no-commit 3630a43f51abaf302e02def9ed16f95c8b121423 # https://googleplex-android-review.git.corp.google.com/#/c/839681/
Also:
didn't revert the changes in java source file of ag/842208 because
it fixed a bug on tablet (see the decription in https://googleplex-android-review.git.corp.google.com/#/c/842208/)
Bug 27257097
Change-Id: I43a78c915fa18db72d4ff7f03832b0cbf1acd5c0
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index fc088f4..c530299 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -28,7 +28,7 @@
android:layout_height="@dimen/search_box_icon_size"
android:layout_margin="@dimen/search_box_navigation_icon_margin"
android:src="@drawable/ic_back_arrow"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_search"
android:tint="@color/actionbar_background_color" />
@@ -55,7 +55,7 @@
android:padding="@dimen/search_box_close_icon_padding"
android:src="@drawable/ic_close_dk"
android:clickable="true"
- android:background="?attr/selectableItemBackgroundBorderless"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/description_clear_search"
android:tint="@color/searchbox_icon_tint"/>
diff --git a/res-common/values-sw600dp/styles.xml b/res-common/values-sw600dp/styles.xml
index 2550683..2130ce1 100644
--- a/res-common/values-sw600dp/styles.xml
+++ b/res-common/values-sw600dp/styles.xml
@@ -15,12 +15,9 @@
-->
<resources>
- <style name="ContactListFilterTheme" parent="Theme.AppCompat.Light.Dialog">
+ <style name="ContactListFilterTheme" parent="@android:Theme.Holo.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 aa52220..77c4677 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -69,11 +69,8 @@
<item name="android:overScrollMode">always</item>
</style>
- <style name="ContactListFilterTheme" parent="Theme.AppCompat.Light">
+ <style name="ContactListFilterTheme" parent="@android:Theme.Holo.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">