diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/menu/conversations.xml | |
parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to '')
-rw-r--r-- | src/main/res/menu/conversations.xml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 6c22ed18..4c724d27 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"/> @@ -57,18 +57,6 @@ android:title="@string/enable_notifications"/> <item - android:id="@+id/action_block" - android:orderInCategory="72" - android:showAsAction="never" - android:title="@string/action_block_contact"/> - - <item - android:id="@+id/action_unblock" - android:orderInCategory="73" - android:showAsAction="never" - android:title="@string/action_unblock_contact"/> - - <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" |