Merge "Fix contacts build. Use getVibrantSwatch"
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 98d4214..aa28dbf 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -15,34 +15,6 @@
-->
<resources>
-
- <style name="ContactPickerTheme" parent="@android:Theme.Holo.Light.Dialog">
- <item name="android:windowSoftInputMode">adjustResize</item>
- <item name="android:listViewStyle">@style/ListViewStyle</item>
- <item name="list_item_height">?android:attr/listPreferredItemHeight</item>
- <item name="section_header_background">@drawable/list_title_holo</item>
- <item name="list_item_padding_top">8dip</item>
- <item name="list_item_padding_right">0dip</item>
- <item name="list_item_padding_bottom">8dip</item>
- <item name="list_item_padding_left">24dip</item>
- <item name="list_item_gap_between_image_and_text">8dip</item>
- <item name="list_item_gap_between_label_and_data">5dip</item>
- <item name="list_item_presence_icon_margin">18dip</item>
- <item name="list_item_photo_size">64dip</item>
- <item name="list_item_profile_photo_size">80dip</item>
- <item name="list_item_background_color">@color/holo_list_background_color</item>
- <item name="list_item_header_text_indent">8dip</item>
- <item name="list_item_header_text_size">14sp</item>
- <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item>
- <item name="list_item_header_height">30dip</item>
- <item name="list_item_data_width_weight">5</item>
- <item name="list_item_label_width_weight">3</item>
- <item name="contact_browser_list_padding_left">0dip</item>
- <item name="contact_browser_list_padding_right">0dip</item>
- <item name="contact_browser_background">@android:color/transparent</item>
- <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
- </style>
-
<style name="ContactPickerLayout" parent="ContactPickerTheme">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
@@ -64,7 +36,7 @@
<item name="android:background">@android:color/transparent</item>
</style>
- <style name="NonPhoneDialogTheme" parent="@android:Theme.Holo.Light.Dialog">
+ <style name="NonPhoneDialogTheme" parent="@android:Theme.Material.Light.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
</style>