diff options
| -rw-r--r-- | res/menu/conversations.xml | 8 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 2621289a..215bbb66 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -35,15 +35,15 @@ android:showAsAction="never" android:title="@string/invite_contact"/> <item - android:id="@+id/action_archive" + android:id="@+id/action_clear_history" android:orderInCategory="50" android:showAsAction="never" - android:title="@string/action_end_conversation"/> + android:title="@string/action_clear_history"/> <item - android:id="@+id/action_clear_history" + android:id="@+id/action_archive" android:orderInCategory="60" android:showAsAction="never" - android:title="@string/action_clear_history"/> + android:title="@string/action_end_conversation"/> <item android:id="@+id/action_accounts" android:orderInCategory="90" diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java index 05b7cb4a..aa4fda4e 100644 --- a/src/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/eu/siacs/conversations/ui/ConversationActivity.java @@ -309,8 +309,6 @@ public class ConversationActivity extends XmppActivity { MenuItem menuAttach = (MenuItem) menu.findItem(R.id.action_attach_file); MenuItem menuClearHistory = (MenuItem) menu .findItem(R.id.action_clear_history); - MenuItem menuManageAccounts = (MenuItem) menu.findItem(R.id.action_accounts); - MenuItem menuSettings = (MenuItem) menu.findItem(R.id.action_settings); MenuItem menuAdd = (MenuItem) menu.findItem(R.id.action_add); MenuItem menuInviteContact = (MenuItem) menu.findItem(R.id.action_invite); @@ -324,8 +322,6 @@ public class ConversationActivity extends XmppActivity { menuClearHistory.setVisible(false); } else { menuAdd.setVisible(!spl.isSlideable()); - menuSettings.setVisible(!spl.isSlideable()); - menuManageAccounts.setVisible(!spl.isSlideable()); if (this.getSelectedConversation() != null) { if (this.getSelectedConversation().getLatestMessage() .getEncryption() != Message.ENCRYPTION_NONE) { |