diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-22 17:23:31 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-22 17:23:31 +0200 |
| commit | 9fcc195a6dad81c56a28f3924ab4912198fc3c38 (patch) | |
| tree | aea420a24d66887e51d763076e687eb123b0fbad /src/eu/siacs/conversations | |
| parent | 2345398652d03cdecf10f548cd71d982adf07995 (diff) | |
brought settings and manage account menu items back
Diffstat (limited to 'src/eu/siacs/conversations')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationActivity.java | 4 |
1 files changed, 0 insertions, 4 deletions
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) { |