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/editaccount.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/editaccount.xml')
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 2301caf0..4ce9e1f3 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -5,4 +5,19 @@ android:title="@string/show_qr_code" android:showAsAction="never" /> + <item + android:id="@+id/action_show_block_list" + android:title="@string/show_block_list" + android:showAsAction="never" /> + + <item + android:id="@+id/action_server_info_show_more" + android:title="@string/server_info_show_more" + android:checkable="true" + android:checked="false" + android:showAsAction="never" /> + + <item android:id="@+id/action_change_password_on_server" + android:title="@string/change_password" + android:showAsAction="never" /> </menu>
\ No newline at end of file |