aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--res/drawable-hdpi/ic_action_add.pngbin181 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_add_group.pngbin0 -> 876 bytes
-rw-r--r--res/drawable-hdpi/ic_action_add_person.pngbin679 -> 616 bytes
-rw-r--r--res/drawable-hdpi/ic_action_delete.pngbin1624 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_discard.pngbin454 -> 450 bytes
-rw-r--r--res/drawable-hdpi/ic_action_edit.pngbin884 -> 765 bytes
-rw-r--r--res/drawable-hdpi/ic_action_group.pngbin859 -> 776 bytes
-rw-r--r--res/drawable-hdpi/ic_action_new.pngbin0 -> 262 bytes
-rw-r--r--res/drawable-hdpi/ic_action_new_attachment.pngbin648 -> 587 bytes
-rw-r--r--res/drawable-hdpi/ic_action_not_secure.pngbin0 -> 367 bytes
-rw-r--r--res/drawable-hdpi/ic_action_person.pngbin573 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_search.pngbin702 -> 650 bytes
-rw-r--r--res/drawable-hdpi/ic_action_secure.pngbin394 -> 384 bytes
-rw-r--r--res/drawable-hdpi/ic_action_send.pngbin342 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_action_unsecure.pngbin368 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add.pngbin134 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add_group.pngbin0 -> 634 bytes
-rw-r--r--res/drawable-mdpi/ic_action_add_person.pngbin513 -> 469 bytes
-rw-r--r--res/drawable-mdpi/ic_action_delete.pngbin1359 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_discard.pngbin333 -> 324 bytes
-rw-r--r--res/drawable-mdpi/ic_action_edit.pngbin587 -> 522 bytes
-rw-r--r--res/drawable-mdpi/ic_action_group.pngbin557 -> 546 bytes
-rw-r--r--res/drawable-mdpi/ic_action_new.pngbin0 -> 185 bytes
-rw-r--r--res/drawable-mdpi/ic_action_new_attachment.pngbin468 -> 415 bytes
-rw-r--r--res/drawable-mdpi/ic_action_not_secure.pngbin0 -> 298 bytes
-rw-r--r--res/drawable-mdpi/ic_action_person.pngbin468 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_search.pngbin479 -> 449 bytes
-rw-r--r--res/drawable-mdpi/ic_action_secure.pngbin317 -> 304 bytes
-rw-r--r--res/drawable-mdpi/ic_action_send.pngbin246 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_action_unsecure.pngbin283 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add.pngbin201 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add_group.pngbin0 -> 1122 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_add_person.pngbin884 -> 798 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_delete.pngbin1848 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_discard.pngbin552 -> 543 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_edit.pngbin1179 -> 994 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_group.pngbin1086 -> 1048 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_new.pngbin0 -> 234 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_new_attachment.pngbin789 -> 753 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_not_secure.pngbin0 -> 482 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_person.pngbin781 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_search.pngbin900 -> 827 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_secure.pngbin510 -> 468 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_send.pngbin416 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_action_unsecure.pngbin458 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_add_group.pngbin0 -> 1643 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_add_person.pngbin1171 -> 1088 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_discard.pngbin781 -> 765 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_edit.pngbin1670 -> 1458 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_group.pngbin1560 -> 1475 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_new.pngbin0 -> 288 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_new_attachment.pngbin1112 -> 1048 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_not_secure.pngbin0 -> 593 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_person.pngbin1004 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_search.pngbin1153 -> 1152 bytes
-rw-r--r--res/drawable-xxhdpi/ic_action_secure.pngbin624 -> 586 bytes
-rw-r--r--res/menu/conversations.xml7
-rw-r--r--res/menu/manageaccounts_context.xml2
-rw-r--r--res/menu/newconversation_context.xml1
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
deleted file mode 100644
index aa7cf4f2..00000000
--- a/res/drawable-hdpi/ic_action_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_add_group.png b/res/drawable-hdpi/ic_action_add_group.png
new file mode 100644
index 00000000..97640355
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_add_person.png b/res/drawable-hdpi/ic_action_add_person.png
index 5ebac970..9d88d0f4 100644
--- a/res/drawable-hdpi/ic_action_add_person.png
+++ b/res/drawable-hdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_delete.png b/res/drawable-hdpi/ic_action_delete.png
deleted file mode 100644
index e9ce89e0..00000000
--- a/res/drawable-hdpi/ic_action_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_discard.png b/res/drawable-hdpi/ic_action_discard.png
index 9c717dd3..703b31f8 100644
--- a/res/drawable-hdpi/ic_action_discard.png
+++ b/res/drawable-hdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_edit.png b/res/drawable-hdpi/ic_action_edit.png
index 5f7c6eff..756db316 100644
--- a/res/drawable-hdpi/ic_action_edit.png
+++ b/res/drawable-hdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_group.png b/res/drawable-hdpi/ic_action_group.png
index 271980b9..3e7f16d5 100644
--- a/res/drawable-hdpi/ic_action_group.png
+++ b/res/drawable-hdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_new.png b/res/drawable-hdpi/ic_action_new.png
new file mode 100644
index 00000000..d866d616
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/res/drawable-hdpi/ic_action_new_attachment.png
index 28507da2..c01c2b38 100644
--- a/res/drawable-hdpi/ic_action_new_attachment.png
+++ b/res/drawable-hdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_not_secure.png b/res/drawable-hdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..2c917615
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png
deleted file mode 100644
index 9fd81097..00000000
--- a/res/drawable-hdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_search.png b/res/drawable-hdpi/ic_action_search.png
index f594b4e4..772e3598 100644
--- a/res/drawable-hdpi/ic_action_search.png
+++ b/res/drawable-hdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_secure.png b/res/drawable-hdpi/ic_action_secure.png
index 287ae2fb..4439d1ae 100644
--- a/res/drawable-hdpi/ic_action_secure.png
+++ b/res/drawable-hdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_send.png b/res/drawable-hdpi/ic_action_send.png
deleted file mode 100644
index 6384a4ee..00000000
--- a/res/drawable-hdpi/ic_action_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_action_unsecure.png b/res/drawable-hdpi/ic_action_unsecure.png
deleted file mode 100644
index b9f442d5..00000000
--- a/res/drawable-hdpi/ic_action_unsecure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add.png b/res/drawable-mdpi/ic_action_add.png
deleted file mode 100644
index 99b189a0..00000000
--- a/res/drawable-mdpi/ic_action_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add_group.png b/res/drawable-mdpi/ic_action_add_group.png
new file mode 100644
index 00000000..9a655899
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_add_person.png b/res/drawable-mdpi/ic_action_add_person.png
index c43cf655..b7d8f46a 100644
--- a/res/drawable-mdpi/ic_action_add_person.png
+++ b/res/drawable-mdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_delete.png b/res/drawable-mdpi/ic_action_delete.png
deleted file mode 100644
index cedb1085..00000000
--- a/res/drawable-mdpi/ic_action_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_discard.png b/res/drawable-mdpi/ic_action_discard.png
index 9dfb7cc2..248fb09c 100644
--- a/res/drawable-mdpi/ic_action_discard.png
+++ b/res/drawable-mdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_edit.png b/res/drawable-mdpi/ic_action_edit.png
index 650b4d89..68a45320 100644
--- a/res/drawable-mdpi/ic_action_edit.png
+++ b/res/drawable-mdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_group.png b/res/drawable-mdpi/ic_action_group.png
index 06dbeecd..1ee3cccd 100644
--- a/res/drawable-mdpi/ic_action_group.png
+++ b/res/drawable-mdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_new.png b/res/drawable-mdpi/ic_action_new.png
new file mode 100644
index 00000000..f17e7980
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_new_attachment.png b/res/drawable-mdpi/ic_action_new_attachment.png
index 33058655..1d265aac 100644
--- a/res/drawable-mdpi/ic_action_new_attachment.png
+++ b/res/drawable-mdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_not_secure.png b/res/drawable-mdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..faffa233
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png
deleted file mode 100644
index 359da1c1..00000000
--- a/res/drawable-mdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_search.png b/res/drawable-mdpi/ic_action_search.png
index 2e446ec0..4edb1ff9 100644
--- a/res/drawable-mdpi/ic_action_search.png
+++ b/res/drawable-mdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_secure.png b/res/drawable-mdpi/ic_action_secure.png
index d4921723..05332ebf 100644
--- a/res/drawable-mdpi/ic_action_secure.png
+++ b/res/drawable-mdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_send.png b/res/drawable-mdpi/ic_action_send.png
deleted file mode 100644
index 4552ae6d..00000000
--- a/res/drawable-mdpi/ic_action_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_action_unsecure.png b/res/drawable-mdpi/ic_action_unsecure.png
deleted file mode 100644
index 84072abd..00000000
--- a/res/drawable-mdpi/ic_action_unsecure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add.png b/res/drawable-xhdpi/ic_action_add.png
deleted file mode 100644
index 9d6af042..00000000
--- a/res/drawable-xhdpi/ic_action_add.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add_group.png b/res/drawable-xhdpi/ic_action_add_group.png
new file mode 100644
index 00000000..c493aa5a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/res/drawable-xhdpi/ic_action_add_person.png
index 91434a47..4e8de1b6 100644
--- a/res/drawable-xhdpi/ic_action_add_person.png
+++ b/res/drawable-xhdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png
deleted file mode 100644
index 98c73da1..00000000
--- a/res/drawable-xhdpi/ic_action_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_discard.png b/res/drawable-xhdpi/ic_action_discard.png
index db69d6c2..9eeeed12 100644
--- a/res/drawable-xhdpi/ic_action_discard.png
+++ b/res/drawable-xhdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_edit.png b/res/drawable-xhdpi/ic_action_edit.png
index 8ab436d8..67e056fe 100644
--- a/res/drawable-xhdpi/ic_action_edit.png
+++ b/res/drawable-xhdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_group.png b/res/drawable-xhdpi/ic_action_group.png
index ea3f24e7..fa2af497 100644
--- a/res/drawable-xhdpi/ic_action_group.png
+++ b/res/drawable-xhdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_new.png b/res/drawable-xhdpi/ic_action_new.png
new file mode 100644
index 00000000..dde2141f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_new_attachment.png b/res/drawable-xhdpi/ic_action_new_attachment.png
index 4948feec..41cbab20 100644
--- a/res/drawable-xhdpi/ic_action_new_attachment.png
+++ b/res/drawable-xhdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_not_secure.png b/res/drawable-xhdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..c0902a03
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png
deleted file mode 100644
index 03eeb8d6..00000000
--- a/res/drawable-xhdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_search.png b/res/drawable-xhdpi/ic_action_search.png
index aad535e9..19658e4a 100644
--- a/res/drawable-xhdpi/ic_action_search.png
+++ b/res/drawable-xhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_secure.png b/res/drawable-xhdpi/ic_action_secure.png
index 2a089838..4e08b95a 100644
--- a/res/drawable-xhdpi/ic_action_secure.png
+++ b/res/drawable-xhdpi/ic_action_secure.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_send.png b/res/drawable-xhdpi/ic_action_send.png
deleted file mode 100644
index 652ac68d..00000000
--- a/res/drawable-xhdpi/ic_action_send.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_action_unsecure.png b/res/drawable-xhdpi/ic_action_unsecure.png
deleted file mode 100644
index 96b128f2..00000000
--- a/res/drawable-xhdpi/ic_action_unsecure.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_group.png b/res/drawable-xxhdpi/ic_action_add_group.png
new file mode 100644
index 00000000..2b46dbb9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_add_group.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/res/drawable-xxhdpi/ic_action_add_person.png
index f18aa614..e9a58eaf 100644
--- a/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/res/drawable-xxhdpi/ic_action_add_person.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/res/drawable-xxhdpi/ic_action_discard.png
index b522daff..cb1260a4 100644
--- a/res/drawable-xxhdpi/ic_action_discard.png
+++ b/res/drawable-xxhdpi/ic_action_discard.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/res/drawable-xxhdpi/ic_action_edit.png
index f2b2078b..3a241ea4 100644
--- a/res/drawable-xxhdpi/ic_action_edit.png
+++ b/res/drawable-xxhdpi/ic_action_edit.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_group.png b/res/drawable-xxhdpi/ic_action_group.png
index 6ef9b128..9289b1c8 100644
--- a/res/drawable-xxhdpi/ic_action_group.png
+++ b/res/drawable-xxhdpi/ic_action_group.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_new.png b/res/drawable-xxhdpi/ic_action_new.png
new file mode 100644
index 00000000..c42c2bfb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_new.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/res/drawable-xxhdpi/ic_action_new_attachment.png
index 78553886..ce7536cb 100644
--- a/res/drawable-xxhdpi/ic_action_new_attachment.png
+++ b/res/drawable-xxhdpi/ic_action_new_attachment.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_not_secure.png b/res/drawable-xxhdpi/ic_action_not_secure.png
new file mode 100644
index 00000000..a186f1fb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_not_secure.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png
deleted file mode 100644
index fd1bcdd4..00000000
--- a/res/drawable-xxhdpi/ic_action_person.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/res/drawable-xxhdpi/ic_action_search.png
index 9c0ea3ca..a1086388 100644
--- a/res/drawable-xxhdpi/ic_action_search.png
+++ b/res/drawable-xxhdpi/ic_action_search.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_secure.png b/res/drawable-xxhdpi/ic_action_secure.png
index d8c094ed..ccf1fb00 100644
--- a/res/drawable-xxhdpi/ic_action_secure.png
+++ b/res/drawable-xxhdpi/ic_action_secure.png
Binary files differ
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index ba627715..710a552e 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 5f76b0e0..04ecc25f 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 7492c265..8b454d42 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"