Gradle Update to 3.0.1 with aapt

2 files changed, 72 insertions, 72 deletions

diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index bbb2184f1..0c0b3cefb 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -16,41 +16,41 @@
         <item name="TextSizeHeadline">18sp</item>
         <item name="TextSeparation">5sp</item>
 
-        <item name="attr/color_text_primary">@color/black87</item>
-        <item name="attr/color_text_secondary">@color/black54</item>
-
-        <item name="attr/dialog_horizontal_padding">24dp</item>
-        <item name="attr/dialog_vertical_padding">16dp</item>
-
-        <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
-        <item name="attr/icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
-        <item name="attr/icon_done">@drawable/ic_done_black_24dp</item>
-        <item name="attr/icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
-        <item name="attr/icon_new">@drawable/ic_contacts_white_24dp</item>
-        <item name="attr/icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
-        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="attr/icon_remove">@drawable/ic_delete_grey600_24dp</item>
-        <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
-        <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
-        <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-
-        <item name="attr/ic_attach_camera">@drawable/ic_attach_camera</item>
-        <item name="attr/ic_attach_document">@drawable/ic_attach_document</item>
-        <item name="attr/ic_attach_location">@drawable/ic_attach_location</item>
-        <item name="attr/ic_attach_photo">@drawable/ic_attach_photo</item>
-        <item name="attr/ic_attach_video">@drawable/ic_attach_video</item>
-        <item name="attr/ic_attach_record">@drawable/ic_attach_record</item>
+        <item name="color_text_primary">@color/black87</item>
+        <item name="color_text_secondary">@color/black54</item>
+
+        <item name="dialog_horizontal_padding">24dp</item>
+        <item name="dialog_vertical_padding">16dp</item>
+
+        <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
+        <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+        <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
+        <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
+        <item name="icon_done">@drawable/ic_done_black_24dp</item>
+        <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
+        <item name="icon_group">@drawable/ic_group_white_24dp</item>
+        <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
+        <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
+        <item name="icon_search">@drawable/ic_search_white_24dp</item>
+        <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
+        <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
+        <item name="icon_share">@drawable/ic_share_white_24dp</item>
+        <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
+
+        <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
+        <item name="ic_attach_document">@drawable/ic_attach_document</item>
+        <item name="ic_attach_location">@drawable/ic_attach_location</item>
+        <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
+        <item name="ic_attach_video">@drawable/ic_attach_video</item>
+        <item name="ic_attach_record">@drawable/ic_attach_record</item>
 
     </style>
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 01540d100..a20b5c6c6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -12,46 +12,46 @@
         <item name="TextSizeHeadline">18sp</item>
         <item name="TextSeparation">5sp</item>
 
-        <item name="attr/color_text_primary">@color/black87</item>
-        <item name="attr/color_text_secondary">@color/black54</item>
+        <item name="color_text_primary">@color/black87</item>
+        <item name="color_text_secondary">@color/black54</item>
 
-        <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item name="attr/icon_chat">@drawable/ic_action_chat</item>
-        <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
-        <item name="attr/icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
-        <item name="attr/icon_done">@drawable/ic_done_black_24dp</item>
-        <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
-        <item name="attr/icon_new">@drawable/ic_contacts_white_24dp</item>
-        <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="attr/icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item name="attr/icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
-        <item name="attr/icon_remove">@drawable/ic_delete_grey600_24dp</item>
-        <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
-        <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
-        <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item name="attr/icon_share">@drawable/ic_share_white_24dp</item>
-        <item name="attr/icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-        <item name="attr/dialog_horizontal_padding">16dp</item>
-        <item name="attr/dialog_vertical_padding">16dp</item>
+        <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
+        <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item name="icon_chat">@drawable/ic_action_chat</item>
+        <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+        <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
+        <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
+        <item name="icon_done">@drawable/ic_done_black_24dp</item>
+        <item name="icon_group">@drawable/ic_group_white_24dp</item>
+        <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
+        <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
+        <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
+        <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
+        <item name="icon_search">@drawable/ic_search_white_24dp</item>
+        <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
+        <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
+        <item name="icon_share">@drawable/ic_share_white_24dp</item>
+        <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
+        <item name="dialog_horizontal_padding">16dp</item>
+        <item name="dialog_vertical_padding">16dp</item>
 
-        <item name="attr/ic_attach_camera">@drawable/ic_attach_camera</item>
-        <item name="attr/ic_attach_document">@drawable/ic_attach_document</item>
-        <item name="attr/ic_attach_location">@drawable/ic_attach_location</item>
-        <item name="attr/ic_attach_photo">@drawable/ic_attach_photo</item>
-        <item name="attr/ic_attach_video">@drawable/ic_attach_video</item>
-        <item name="attr/ic_attach_record">@drawable/ic_attach_record</item>
+        <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
+        <item name="ic_attach_document">@drawable/ic_attach_document</item>
+        <item name="ic_attach_location">@drawable/ic_attach_location</item>
+        <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
+        <item name="ic_attach_video">@drawable/ic_attach_video</item>
+        <item name="ic_attach_record">@drawable/ic_attach_record</item>
 
-        <item name="attr/ic_file_apk">@drawable/ic_file_grey600_48dp</item>
-        <item name="attr/ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
-        <item name="attr/ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
-        <item name="attr/ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
+        <item name="ic_file_apk">@drawable/ic_file_grey600_48dp</item>
+        <item name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item>
+        <item name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item>
+        <item name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">