sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

brought settings and manage account menu items back

This commit is contained in:
iNPUTmice 2014-07-22 17:23:31 +02:00
parent 2345398652
commit 9fcc195a6d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/menu/conversations.xml
View File

@ -35,15 +35,15 @@
android:showAsAction="never" android:showAsAction="never"
android:title="@string/invite_contact"/> android:title="@string/invite_contact"/>
<item <item
android:id="@+id/action_archive" android:id="@+id/action_clear_history"
android:orderInCategory="50" android:orderInCategory="50"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_end_conversation"/> android:title="@string/action_clear_history"/>
<item <item
android:id="@+id/action_clear_history" android:id="@+id/action_archive"
android:orderInCategory="60" android:orderInCategory="60"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_clear_history"/> android:title="@string/action_end_conversation"/>
<item <item
android:id="@+id/action_accounts" android:id="@+id/action_accounts"
android:orderInCategory="90" android:orderInCategory="90"

4
src/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -309,8 +309,6 @@ public class ConversationActivity extends XmppActivity {
MenuItem menuAttach = (MenuItem) menu.findItem(R.id.action_attach_file); MenuItem menuAttach = (MenuItem) menu.findItem(R.id.action_attach_file);
MenuItem menuClearHistory = (MenuItem) menu MenuItem menuClearHistory = (MenuItem) menu
.findItem(R.id.action_clear_history); .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 menuAdd = (MenuItem) menu.findItem(R.id.action_add);
MenuItem menuInviteContact = (MenuItem) menu.findItem(R.id.action_invite); MenuItem menuInviteContact = (MenuItem) menu.findItem(R.id.action_invite);
@ -324,8 +322,6 @@ public class ConversationActivity extends XmppActivity {
menuClearHistory.setVisible(false); menuClearHistory.setVisible(false);
} else { } else {
menuAdd.setVisible(!spl.isSlideable()); menuAdd.setVisible(!spl.isSlideable());
menuSettings.setVisible(!spl.isSlideable());
menuManageAccounts.setVisible(!spl.isSlideable());
if (this.getSelectedConversation() != null) { if (this.getSelectedConversation() != null) {
if (this.getSelectedConversation().getLatestMessage() if (this.getSelectedConversation().getLatestMessage()
.getEncryption() != Message.ENCRYPTION_NONE) { .getEncryption() != Message.ENCRYPTION_NONE) {