diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
| commit | 95e2a539517c27b3235acd582f17968c8e301e81 (patch) | |
| tree | 213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/res/menu/manageaccounts.xml | |
| parent | 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff) | |
| parent | 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/Config.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
Diffstat (limited to 'src/main/res/menu/manageaccounts.xml')
| -rw-r--r-- | src/main/res/menu/manageaccounts.xml | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index b5cd9b50..5b04484f 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -1,15 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/action_add_account" - android:icon="@drawable/ic_action_add_person" - android:showAsAction="always" - android:title="@string/action_add_account"/> - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/action_settings"/> + <item + android:id="@+id/action_add_account" + android:icon="@drawable/ic_action_add_person" + android:showAsAction="always" + android:title="@string/action_add_account"/> + <item + android:id="@+id/action_enable_all" + android:title="@string/enable_all_accounts"/> + <item + android:id="@+id/action_disable_all" + android:title="@string/disable_all_accounts"/> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings"/> </menu>
\ No newline at end of file |