Merge res-common resources with exising file in res
For each file, the res-common values are appended to the
the end of the file in res with the same name
Bug 30759296
Change-Id: Icda411d2a9f8acedc51a982be0f4c8c8b7f7c69f
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 86c46fc..e979611 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -49,4 +49,71 @@
<attr name="layout_widePaddingRight" format="dimension"/>
</declare-styleable>
+ <declare-styleable name="Theme">
+ <attr name="android:textColorSecondary" />
+ </declare-styleable>
+
+ <declare-styleable name="ContactsDataKind">
+ <!-- Mime-type handled by this mapping. -->
+ <attr name="android:mimeType" />
+ <!-- Icon used to represent data of this kind. -->
+ <attr name="android:icon" />
+ <!-- Column in data table that summarizes this data. -->
+ <attr name="android:summaryColumn" />
+ <!-- Column in data table that contains details for this data. -->
+ <attr name="android:detailColumn" />
+ <!-- Flag indicating that detail should be built from SocialProvider. -->
+ <attr name="android:detailSocialSummary" />
+ <!-- Resource representing the term "All Contacts" (e.g. "All Friends" or
+ "All connections"). Optional (Default is "All Contacts"). -->
+ <attr name="android:allContactsName" />
+ </declare-styleable>
+
+ <declare-styleable name="ContactListItemView">
+ <attr name="list_item_height" format="dimension"/>
+ <attr name="list_section_header_height" format="dimension"/>
+ <attr name="activated_background" format="reference"/>
+ <attr name="section_header_background" format="reference"/>
+ <attr name="list_item_padding_top" format="dimension"/>
+ <attr name="list_item_padding_right" format="dimension"/>
+ <attr name="list_item_padding_bottom" format="dimension"/>
+ <attr name="list_item_padding_left" format="dimension"/>
+ <attr name="list_item_gap_between_image_and_text" format="dimension"/>
+ <attr name="list_item_gap_between_indexer_and_image" format="dimension"/>
+ <attr name="list_item_gap_between_label_and_data" format="dimension"/>
+ <attr name="list_item_presence_icon_margin" format="dimension"/>
+ <attr name="list_item_presence_icon_size" format="dimension"/>
+ <attr name="list_item_photo_size" format="dimension"/>
+ <attr name="list_item_profile_photo_size" format="dimension"/>
+ <attr name="list_item_prefix_highlight_color" format="color"/>
+ <attr name="list_item_background_color" format="color"/>
+ <attr name="list_item_header_text_indent" format="dimension"/>
+ <attr name="list_item_header_text_color" format="color"/>
+ <attr name="list_item_header_text_size" format="dimension"/>
+ <attr name="list_item_header_height" format="dimension"/>
+ <attr name="list_item_name_text_color" format="color"/>
+ <attr name="list_item_name_text_size" format="dimension"/>
+ <attr name="list_item_text_indent" format="dimension"/>
+ <attr name="list_item_text_offset_top" format="dimension"/>
+ <attr name="list_item_avatar_offset_top" format="dimension"/>
+ <attr name="list_item_data_width_weight" format="integer"/>
+ <attr name="list_item_label_width_weight" format="integer"/>
+ <attr name="list_item_video_call_icon_size" format="dimension"/>
+ <attr name="list_item_video_call_icon_margin" format="dimension"/>
+ </declare-styleable>
+
+ <declare-styleable name="ContactBrowser">
+ <attr name="contact_browser_list_padding_left" format="dimension"/>
+ <attr name="contact_browser_list_padding_right" format="dimension"/>
+ <attr name="contact_browser_background" format="reference"/>
+ </declare-styleable>
+
+ <declare-styleable name="ProportionalLayout">
+ <attr name="direction" format="string"/>
+ <attr name="ratio" format="float"/>
+ </declare-styleable>
+
+ <declare-styleable name="Favorites">
+ <attr name="favorites_padding_bottom" format="dimension"/>
+ </declare-styleable>
</resources>