diff options
| author | Beriain <beriain@bitmessage.ch> | 2014-05-12 17:09:32 +0200 |
|---|---|---|
| committer | Beriain <beriain@bitmessage.ch> | 2014-05-12 17:09:32 +0200 |
| commit | 75f7695087355978a236a701283a86bacdd8a54c (patch) | |
| tree | 516c1262b83a4a4ae5240a8451c10c79eb31584c /res/menu/conversations.xml | |
| parent | 42c07bf4ae83a4bc51664fdf35f02b917b57baa4 (diff) | |
| parent | 4be8280beb9c61e4a11b67b61617455dbe52b466 (diff) | |
Merge https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/menu/conversations.xml')
| -rw-r--r-- | res/menu/conversations.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 58fd3bfa..68bcc957 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -4,13 +4,13 @@ android:id="@+id/action_add" android:orderInCategory="10" android:icon="@drawable/ic_action_add" - android:showAsAction="always" + android:showAsAction="ifRoom" android:title="@string/action_add" /> <item android:id="@+id/action_security" android:orderInCategory="20" - android:showAsAction="always" + android:showAsAction="ifRoom" android:icon="@drawable/ic_action_unsecure" android:title="@string/action_secure" /> |