diff options
59 files changed, 4 insertions, 6 deletions
diff --git a/res/drawable-hdpi/ic_action_add.png b/res/drawable-hdpi/ic_action_add.png Binary files differdeleted file mode 100644 index aa7cf4f2c..000000000 --- a/res/drawable-hdpi/ic_action_add.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_add_group.png b/res/drawable-hdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 000000000..976403554 --- /dev/null +++ b/res/drawable-hdpi/ic_action_add_group.png diff --git a/res/drawable-hdpi/ic_action_add_person.png b/res/drawable-hdpi/ic_action_add_person.png Binary files differindex 5ebac9706..9d88d0f48 100644 --- a/res/drawable-hdpi/ic_action_add_person.png +++ b/res/drawable-hdpi/ic_action_add_person.png diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png Binary files differdeleted file mode 100644 index e9ce89e04..000000000 --- a/res/drawable-hdpi/ic_action_delete.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_discard.png b/res/drawable-hdpi/ic_action_discard.png Binary files differindex 9c717dd32..703b31f80 100644 --- a/res/drawable-hdpi/ic_action_discard.png +++ b/res/drawable-hdpi/ic_action_discard.png diff --git a/res/drawable-hdpi/ic_action_edit.png b/res/drawable-hdpi/ic_action_edit.png Binary files differindex 5f7c6eff3..756db316e 100644 --- a/res/drawable-hdpi/ic_action_edit.png +++ b/res/drawable-hdpi/ic_action_edit.png diff --git a/res/drawable-hdpi/ic_action_group.png b/res/drawable-hdpi/ic_action_group.png Binary files differindex 271980b97..3e7f16d51 100644 --- a/res/drawable-hdpi/ic_action_group.png +++ b/res/drawable-hdpi/ic_action_group.png diff --git a/res/drawable-hdpi/ic_action_new.png b/res/drawable-hdpi/ic_action_new.png Binary files differnew file mode 100644 index 000000000..d866d6160 --- /dev/null +++ b/res/drawable-hdpi/ic_action_new.png diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/res/drawable-hdpi/ic_action_new_attachment.png Binary files differindex 28507da2d..c01c2b382 100644 --- a/res/drawable-hdpi/ic_action_new_attachment.png +++ b/res/drawable-hdpi/ic_action_new_attachment.png diff --git a/res/drawable-hdpi/ic_action_not_secure.png b/res/drawable-hdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 000000000..2c917615f --- /dev/null +++ b/res/drawable-hdpi/ic_action_not_secure.png diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png Binary files differdeleted file mode 100644 index 9fd81097b..000000000 --- a/res/drawable-hdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png Binary files differindex f594b4e48..772e3598e 100644 --- a/res/drawable-hdpi/ic_action_search.png +++ b/res/drawable-hdpi/ic_action_search.png diff --git a/res/drawable-hdpi/ic_action_secure.png b/res/drawable-hdpi/ic_action_secure.png Binary files differindex 287ae2fb0..4439d1aec 100644 --- a/res/drawable-hdpi/ic_action_secure.png +++ b/res/drawable-hdpi/ic_action_secure.png diff --git a/res/drawable-hdpi/ic_action_send.png b/res/drawable-hdpi/ic_action_send.png Binary files differdeleted file mode 100644 index 6384a4eec..000000000 --- a/res/drawable-hdpi/ic_action_send.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_action_unsecure.png b/res/drawable-hdpi/ic_action_unsecure.png Binary files differdeleted file mode 100644 index b9f442d57..000000000 --- a/res/drawable-hdpi/ic_action_unsecure.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_add.png b/res/drawable-mdpi/ic_action_add.png Binary files differdeleted file mode 100644 index 99b189a0c..000000000 --- a/res/drawable-mdpi/ic_action_add.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_add_group.png b/res/drawable-mdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 000000000..9a6558992 --- /dev/null +++ b/res/drawable-mdpi/ic_action_add_group.png diff --git a/res/drawable-mdpi/ic_action_add_person.png b/res/drawable-mdpi/ic_action_add_person.png Binary files differindex c43cf6553..b7d8f46a9 100644 --- a/res/drawable-mdpi/ic_action_add_person.png +++ b/res/drawable-mdpi/ic_action_add_person.png diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png Binary files differdeleted file mode 100644 index cedb1085b..000000000 --- a/res/drawable-mdpi/ic_action_delete.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_discard.png b/res/drawable-mdpi/ic_action_discard.png Binary files differindex 9dfb7cc2c..248fb09cd 100644 --- a/res/drawable-mdpi/ic_action_discard.png +++ b/res/drawable-mdpi/ic_action_discard.png diff --git a/res/drawable-mdpi/ic_action_edit.png b/res/drawable-mdpi/ic_action_edit.png Binary files differindex 650b4d899..68a453209 100644 --- a/res/drawable-mdpi/ic_action_edit.png +++ b/res/drawable-mdpi/ic_action_edit.png diff --git a/res/drawable-mdpi/ic_action_group.png b/res/drawable-mdpi/ic_action_group.png Binary files differindex 06dbeecd9..1ee3cccdd 100644 --- a/res/drawable-mdpi/ic_action_group.png +++ b/res/drawable-mdpi/ic_action_group.png diff --git a/res/drawable-mdpi/ic_action_new.png b/res/drawable-mdpi/ic_action_new.png Binary files differnew file mode 100644 index 000000000..f17e7980e --- /dev/null +++ b/res/drawable-mdpi/ic_action_new.png diff --git a/res/drawable-mdpi/ic_action_new_attachment.png b/res/drawable-mdpi/ic_action_new_attachment.png Binary files differindex 330586555..1d265aac6 100644 --- a/res/drawable-mdpi/ic_action_new_attachment.png +++ b/res/drawable-mdpi/ic_action_new_attachment.png diff --git a/res/drawable-mdpi/ic_action_not_secure.png b/res/drawable-mdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 000000000..faffa2337 --- /dev/null +++ b/res/drawable-mdpi/ic_action_not_secure.png diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png Binary files differdeleted file mode 100644 index 359da1c12..000000000 --- a/res/drawable-mdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png Binary files differindex 2e446ec03..4edb1ff92 100644 --- a/res/drawable-mdpi/ic_action_search.png +++ b/res/drawable-mdpi/ic_action_search.png diff --git a/res/drawable-mdpi/ic_action_secure.png b/res/drawable-mdpi/ic_action_secure.png Binary files differindex d49217234..05332ebfa 100644 --- a/res/drawable-mdpi/ic_action_secure.png +++ b/res/drawable-mdpi/ic_action_secure.png diff --git a/res/drawable-mdpi/ic_action_send.png b/res/drawable-mdpi/ic_action_send.png Binary files differdeleted file mode 100644 index 4552ae6db..000000000 --- a/res/drawable-mdpi/ic_action_send.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_action_unsecure.png b/res/drawable-mdpi/ic_action_unsecure.png Binary files differdeleted file mode 100644 index 84072abd9..000000000 --- a/res/drawable-mdpi/ic_action_unsecure.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_add.png b/res/drawable-xhdpi/ic_action_add.png Binary files differdeleted file mode 100644 index 9d6af0423..000000000 --- a/res/drawable-xhdpi/ic_action_add.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_add_group.png b/res/drawable-xhdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 000000000..c493aa5a4 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_add_group.png diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/res/drawable-xhdpi/ic_action_add_person.png Binary files differindex 91434a47b..4e8de1b61 100644 --- a/res/drawable-xhdpi/ic_action_add_person.png +++ b/res/drawable-xhdpi/ic_action_add_person.png diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png Binary files differdeleted file mode 100644 index 98c73da1f..000000000 --- a/res/drawable-xhdpi/ic_action_delete.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_discard.png b/res/drawable-xhdpi/ic_action_discard.png Binary files differindex db69d6c25..9eeeed124 100644 --- a/res/drawable-xhdpi/ic_action_discard.png +++ b/res/drawable-xhdpi/ic_action_discard.png diff --git a/res/drawable-xhdpi/ic_action_edit.png b/res/drawable-xhdpi/ic_action_edit.png Binary files differindex 8ab436d87..67e056fef 100644 --- a/res/drawable-xhdpi/ic_action_edit.png +++ b/res/drawable-xhdpi/ic_action_edit.png diff --git a/res/drawable-xhdpi/ic_action_group.png b/res/drawable-xhdpi/ic_action_group.png Binary files differindex ea3f24e73..fa2af4974 100644 --- a/res/drawable-xhdpi/ic_action_group.png +++ b/res/drawable-xhdpi/ic_action_group.png diff --git a/res/drawable-xhdpi/ic_action_new.png b/res/drawable-xhdpi/ic_action_new.png Binary files differnew file mode 100644 index 000000000..dde2141f2 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_new.png diff --git a/res/drawable-xhdpi/ic_action_new_attachment.png b/res/drawable-xhdpi/ic_action_new_attachment.png Binary files differindex 4948feec2..41cbab203 100644 --- a/res/drawable-xhdpi/ic_action_new_attachment.png +++ b/res/drawable-xhdpi/ic_action_new_attachment.png diff --git a/res/drawable-xhdpi/ic_action_not_secure.png b/res/drawable-xhdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 000000000..c0902a03e --- /dev/null +++ b/res/drawable-xhdpi/ic_action_not_secure.png diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png Binary files differdeleted file mode 100644 index 03eeb8d6a..000000000 --- a/res/drawable-xhdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png Binary files differindex aad535e97..19658e4a2 100644 --- a/res/drawable-xhdpi/ic_action_search.png +++ b/res/drawable-xhdpi/ic_action_search.png diff --git a/res/drawable-xhdpi/ic_action_secure.png b/res/drawable-xhdpi/ic_action_secure.png Binary files differindex 2a0898381..4e08b95ad 100644 --- a/res/drawable-xhdpi/ic_action_secure.png +++ b/res/drawable-xhdpi/ic_action_secure.png diff --git a/res/drawable-xhdpi/ic_action_send.png b/res/drawable-xhdpi/ic_action_send.png Binary files differdeleted file mode 100644 index 652ac68d0..000000000 --- a/res/drawable-xhdpi/ic_action_send.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_action_unsecure.png b/res/drawable-xhdpi/ic_action_unsecure.png Binary files differdeleted file mode 100644 index 96b128f2c..000000000 --- a/res/drawable-xhdpi/ic_action_unsecure.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_action_add_group.png b/res/drawable-xxhdpi/ic_action_add_group.png Binary files differnew file mode 100644 index 000000000..2b46dbb9a --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_add_group.png diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png Binary files differindex f18aa6144..e9a58eafc 100644 --- a/res/drawable-xxhdpi/ic_action_add_person.png +++ b/res/drawable-xxhdpi/ic_action_add_person.png diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/res/drawable-xxhdpi/ic_action_discard.png Binary files differindex b522daffe..cb1260a4c 100644 --- a/res/drawable-xxhdpi/ic_action_discard.png +++ b/res/drawable-xxhdpi/ic_action_discard.png diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/res/drawable-xxhdpi/ic_action_edit.png Binary files differindex f2b2078b0..3a241ea41 100644 --- a/res/drawable-xxhdpi/ic_action_edit.png +++ b/res/drawable-xxhdpi/ic_action_edit.png diff --git a/res/drawable-xxhdpi/ic_action_group.png b/res/drawable-xxhdpi/ic_action_group.png Binary files differindex 6ef9b128a..9289b1c8f 100644 --- a/res/drawable-xxhdpi/ic_action_group.png +++ b/res/drawable-xxhdpi/ic_action_group.png diff --git a/res/drawable-xxhdpi/ic_action_new.png b/res/drawable-xxhdpi/ic_action_new.png Binary files differnew file mode 100644 index 000000000..c42c2bfb5 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_new.png diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/res/drawable-xxhdpi/ic_action_new_attachment.png Binary files differindex 785538862..ce7536cbd 100644 --- a/res/drawable-xxhdpi/ic_action_new_attachment.png +++ b/res/drawable-xxhdpi/ic_action_new_attachment.png diff --git a/res/drawable-xxhdpi/ic_action_not_secure.png b/res/drawable-xxhdpi/ic_action_not_secure.png Binary files differnew file mode 100644 index 000000000..a186f1fb2 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_not_secure.png diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png Binary files differdeleted file mode 100644 index fd1bcdd45..000000000 --- a/res/drawable-xxhdpi/ic_action_person.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png Binary files differindex 9c0ea3ca0..a10863887 100644 --- a/res/drawable-xxhdpi/ic_action_search.png +++ b/res/drawable-xxhdpi/ic_action_search.png diff --git a/res/drawable-xxhdpi/ic_action_secure.png b/res/drawable-xxhdpi/ic_action_secure.png Binary files differindex d8c094ed8..ccf1fb00c 100644 --- a/res/drawable-xxhdpi/ic_action_secure.png +++ b/res/drawable-xxhdpi/ic_action_secure.png diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index ba627715b..710a552e4 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -3,7 +3,7 @@ <item android:id="@+id/action_add" android:orderInCategory="10" - android:icon="@drawable/ic_action_add" + android:icon="@drawable/ic_action_new" android:showAsAction="always" android:title="@string/action_add" /> @@ -11,7 +11,7 @@ android:id="@+id/action_security" android:orderInCategory="20" android:showAsAction="always" - android:icon="@drawable/ic_action_unsecure" + android:icon="@drawable/ic_action_not_secure" android:title="@string/action_secure" /> <item @@ -24,8 +24,7 @@ <item android:id="@+id/action_contact_details" android:orderInCategory="40" - android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_person" + android:showAsAction="never" android:title="@string/action_contact_details" /> <item android:id="@+id/action_muc_details" diff --git a/res/menu/manageaccounts_context.xml b/res/menu/manageaccounts_context.xml index 5f76b0e0c..04ecc25f7 100644 --- a/res/menu/manageaccounts_context.xml +++ b/res/menu/manageaccounts_context.xml @@ -8,7 +8,7 @@ android:title="@string/mgmt_account_edit"/> <item android:id="@+id/mgmt_account_delete" - android:icon="@drawable/ic_action_delete" + android:icon="@drawable/ic_action_discard" android:showAsAction="always" android:title="@string/mgmt_account_delete"/> <item diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml index 7492c2654..8b454d420 100644 --- a/res/menu/newconversation_context.xml +++ b/res/menu/newconversation_context.xml @@ -4,7 +4,6 @@ <item android:id="@+id/action_contact_details" android:showAsAction="ifRoom" - android:icon="@drawable/ic_action_person" android:title="@string/action_contact_details" /> <item android:id="@+id/action_start_conversation" |
