aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorAlethea Butler <alethea@alethea.io>2014-05-30 23:18:50 -0400
committerAlethea Butler <alethea@alethea.io>2014-05-30 23:18:50 -0400
commit78686e9bce44d6279cb1475945309325888f0fc3 (patch)
tree48edd23735cb0057432f86f34e078bd82e8421d4 /src/eu/siacs/conversations/ui/ConversationActivity.java
parentb763d7ad5642be5b83ba13d6161fcb0102f50ff6 (diff)
Disabled the Home button when it's not the Up button
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationActivity.java')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index c696fa45..232d46f8 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -262,6 +262,7 @@ public class ConversationActivity extends XmppActivity {
public void onPanelOpened(View arg0) {
paneShouldBeOpen = true;
getActionBar().setDisplayHomeAsUpEnabled(false);
+ getActionBar().setHomeButtonEnabled(false);
getActionBar().setTitle(R.string.app_name);
invalidateOptionsMenu();
hideKeyboard();
@@ -273,6 +274,7 @@ public class ConversationActivity extends XmppActivity {
if ((conversationList.size() > 0)
&& (getSelectedConversation() != null)) {
getActionBar().setDisplayHomeAsUpEnabled(true);
+ getActionBar().setHomeButtonEnabled(true);
getActionBar().setTitle(
getSelectedConversation().getName(useSubject));
invalidateOptionsMenu();