diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-28 18:46:01 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-02-28 18:46:01 +0100 |
commit | acf80bddd07d5579cdb20a888b3f9e99e53030a5 (patch) | |
tree | 034a8e364488c89c8e1997f56313d919019afa65 /res | |
parent | 03d96266f8bbb76e25610e903d74a0afa7dcd03b (diff) |
rebranding
Diffstat (limited to '')
-rw-r--r-- | res/drawable-hdpi/ic_action_group.png | bin | 0 -> 859 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_action_person.png | bin | 0 -> 573 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_action_group.png | bin | 0 -> 557 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_action_person.png | bin | 0 -> 468 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_action_group.png | bin | 0 -> 1086 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_action_person.png | bin | 0 -> 781 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_action_group.png | bin | 0 -> 1560 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_action_person.png | bin | 0 -> 1004 bytes | |||
-rw-r--r-- | res/menu/conversations.xml | 13 | ||||
-rw-r--r-- | res/values/strings.xml | 5 |
10 files changed, 13 insertions, 5 deletions
diff --git a/res/drawable-hdpi/ic_action_group.png b/res/drawable-hdpi/ic_action_group.png Binary files differnew file mode 100644 index 00000000..271980b9 --- /dev/null +++ b/res/drawable-hdpi/ic_action_group.png diff --git a/res/drawable-hdpi/ic_action_person.png b/res/drawable-hdpi/ic_action_person.png Binary files differnew file mode 100644 index 00000000..9fd81097 --- /dev/null +++ b/res/drawable-hdpi/ic_action_person.png diff --git a/res/drawable-mdpi/ic_action_group.png b/res/drawable-mdpi/ic_action_group.png Binary files differnew file mode 100644 index 00000000..06dbeecd --- /dev/null +++ b/res/drawable-mdpi/ic_action_group.png diff --git a/res/drawable-mdpi/ic_action_person.png b/res/drawable-mdpi/ic_action_person.png Binary files differnew file mode 100644 index 00000000..359da1c1 --- /dev/null +++ b/res/drawable-mdpi/ic_action_person.png diff --git a/res/drawable-xhdpi/ic_action_group.png b/res/drawable-xhdpi/ic_action_group.png Binary files differnew file mode 100644 index 00000000..ea3f24e7 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_group.png diff --git a/res/drawable-xhdpi/ic_action_person.png b/res/drawable-xhdpi/ic_action_person.png Binary files differnew file mode 100644 index 00000000..03eeb8d6 --- /dev/null +++ b/res/drawable-xhdpi/ic_action_person.png diff --git a/res/drawable-xxhdpi/ic_action_group.png b/res/drawable-xxhdpi/ic_action_group.png Binary files differnew file mode 100644 index 00000000..6ef9b128 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_group.png diff --git a/res/drawable-xxhdpi/ic_action_person.png b/res/drawable-xxhdpi/ic_action_person.png Binary files differnew file mode 100644 index 00000000..fd1bcdd4 --- /dev/null +++ b/res/drawable-xxhdpi/ic_action_person.png diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index a6cdd885..bb2bd9ee 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -15,10 +15,17 @@ android:title="@string/action_secure" /> <item - android:id="@+id/action_details" + android:id="@+id/action_contact_details" android:orderInCategory="40" - android:showAsAction="never" - android:title="@string/action_details" /> + android:showAsAction="ifRoom" + android:icon="@drawable/ic_action_person" + android:title="@string/action_contact_details" /> + <item + android:id="@+id/action_muc_details" + android:orderInCategory="40" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_action_group" + android:title="@string/action_muc_details" /> <item android:id="@+id/action_archive" diff --git a/res/values/strings.xml b/res/values/strings.xml index e4ccb8ba..dd372df6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Secure Conversations</string> + <string name="app_name">Conversations</string> <string name="action_settings">Settings</string> <string name="action_add">New conversation</string> <string name="action_accounts">Manage accounts</string> <string name="action_archive">Archive conversation</string> - <string name="action_details">Contact details</string> + <string name="action_contact_details">Contact details</string> + <string name="action_muc_details">Conferenece details</string> <string name="action_secure">Secure conversation</string> <string name="action_add_account">Add account</string> <string name="title_activity_new_conversation">New Conversation</string> |