diff options
author | Sam Whited <sam@samwhited.com> | 2015-01-21 23:00:35 -0500 |
---|---|---|
committer | Sam Whited <sam@samwhited.com> | 2015-01-29 15:28:26 -0500 |
commit | 48604a66201e0c0f403ba1576e35833c7407a7d0 (patch) | |
tree | 2e36b529262f3d18565c7835b4d86b477d748a0d /src/main/res/menu | |
parent | c237a550932b7e68f2f754b8fe33248ae9f0ee5c (diff) |
Use Material Design Icons on API 21+
Diffstat (limited to '')
-rw-r--r-- | src/main/res/menu/choose_contact.xml | 2 | ||||
-rw-r--r-- | src/main/res/menu/contact_details.xml | 4 | ||||
-rw-r--r-- | src/main/res/menu/conversations.xml | 8 | ||||
-rw-r--r-- | src/main/res/menu/manageaccounts.xml | 2 | ||||
-rw-r--r-- | src/main/res/menu/muc_details.xml | 2 | ||||
-rw-r--r-- | src/main/res/menu/share_with.xml | 2 | ||||
-rw-r--r-- | src/main/res/menu/start_conversation.xml | 6 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml index e39091b38..c025d00f8 100644 --- a/src/main/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml @@ -4,7 +4,7 @@ <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" - android:icon="@drawable/ic_action_search" + android:icon="?attr/icon_search" android:showAsAction="collapseActionView|always" android:title="@string/search"/> diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index ba8889d8c..bd81b6d49 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -3,13 +3,13 @@ <item android:id="@+id/action_edit_contact" - android:icon="@drawable/ic_action_edit" + android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_edit_contact"/> <item android:id="@+id/action_delete_contact" - android:icon="@drawable/ic_action_discard" + android:icon="?attr/icon_discard" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_delete_contact"/> diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index d68c1436e..4c724d27d 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -2,19 +2,19 @@ <item android:id="@+id/action_add" - android:icon="@drawable/ic_action_new" + android:icon="?attr/icon_new" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_add"/> <item android:id="@+id/action_security" - android:icon="@drawable/ic_action_not_secure" + android:icon="?attr/icon_not_secure" android:orderInCategory="20" android:showAsAction="always" android:title="@string/action_secure"/> <item android:id="@+id/action_attach_file" - android:icon="@drawable/ic_action_new_attachment" + android:icon="?attr/icon_new_attachment" android:orderInCategory="30" android:showAsAction="always" android:title="@string/attach_file"/> @@ -25,7 +25,7 @@ android:title="@string/action_contact_details"/> <item android:id="@+id/action_muc_details" - android:icon="@drawable/ic_action_group" + android:icon="?attr/icon_group" android:orderInCategory="40" android:showAsAction="ifRoom" android:title="@string/action_muc_details"/> diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 5b04484ff..f8a30ff7b 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_add_account" - android:icon="@drawable/ic_action_add_person" + android:icon="?attr/icon_add_person" android:showAsAction="always" android:title="@string/action_add_account"/> <item diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 7587e55c6..51de4e753 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_edit_subject" - android:icon="@drawable/ic_action_edit" + android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_edit_subject"/> diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml index cbd15c119..bc51f4625 100644 --- a/src/main/res/menu/share_with.xml +++ b/src/main/res/menu/share_with.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_add" - android:icon="@drawable/ic_action_new" + android:icon="?attr/icon_new" android:orderInCategory="10" android:showAsAction="always" android:title="@string/action_add"/> diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index 3dd09e90d..a89d71ffd 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -4,17 +4,17 @@ <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" - android:icon="@drawable/ic_action_search" + android:icon="?attr/icon_search" android:showAsAction="collapseActionView|always" android:title="@string/search" /> <item android:id="@+id/action_create_contact" - android:icon="@drawable/ic_action_add_person" + android:icon="?attr/icon_add_person" android:showAsAction="always" android:title="@string/create_contact" /> <item android:id="@+id/action_join_conference" - android:icon="@drawable/ic_action_add_group" + android:icon="?attr/icon_add_group" android:showAsAction="always" android:title="@string/join_conference" /> <item |