From 555b4ac7663e79ef4226cbd620de9dbfbdcd2eb4 Mon Sep 17 00:00:00 2001
From: Christian S <christian@pix-art.de>
Date: Sat, 16 Apr 2016 19:29:17 +0200
Subject: use material design icons for android < lollipop

---
 src/main/res/menu/editaccount.xml |  4 ++--
 src/main/res/values/themes.xml    | 42 +++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/main')

diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 30831920b..27200a35d 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -8,7 +8,7 @@
     <item
         android:id="@+id/action_show_block_list"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_cancel"
+        android:icon="@drawable/ic_block_white_24dp"
         android:title="@string/show_block_list"/>
 
     <item
@@ -31,7 +31,7 @@
     <item
         android:id="@+id/action_change_password_on_server"
         android:showAsAction="always"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="?attr/icon_edit"
         android:title="@string/change_password"/>
 
     <item
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 7792247aa..db86770fe 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -10,28 +10,28 @@
         <item name="TextSizeBody">16sp</item>
         <item name="TextSizeHeadline">22sp</item>
 
-        <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
-        <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
-        <item name="attr/icon_cancel">@drawable/ic_action_cancel</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_action_copy</item>
-        <item name="attr/icon_discard">@drawable/ic_action_discard</item>
-        <item name="attr/icon_download">@drawable/ic_action_download</item>
-        <item name="attr/icon_edit">@drawable/ic_action_edit</item>
-        <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
-        <item name="attr/icon_done">@drawable/ic_action_done</item>
-
-        <item name="attr/icon_group">@drawable/ic_action_group</item>
-        <item name="attr/icon_new">@drawable/ic_action_new</item>
-        <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
-        <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
-        <item name="attr/icon_refresh">@drawable/ic_action_refresh</item>
-        <item name="attr/icon_remove">@drawable/ic_action_remove</item>
-        <item name="attr/icon_search">@drawable/ic_action_search</item>
-        <item name="attr/icon_secure">@drawable/ic_action_secure</item>
-        <item name="attr/icon_settings">@drawable/ic_action_settings</item>
-        <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
-        <item name="attr/icon_share">@drawable/ic_action_share</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_add_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_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>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
-- 
cgit v1.2.3