From 9fcc195a6dad81c56a28f3924ab4912198fc3c38 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 22 Jul 2014 17:23:31 +0200 Subject: brought settings and manage account menu items back --- src/eu/siacs/conversations/ui/ConversationActivity.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/eu/siacs') 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) { -- cgit v1.2.3