narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #164 from alethea/development

Browse source 
Fix home button up navigation
This commit is contained in:
Daniel Gultsch 2014-05-31 11:55:17 +02:00
parent 4cf7a84576 0edfd36195
commit 1ffba8bd62
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -262,6 +262,7 @@ public class ConversationActivity extends XmppActivity {
public void onPanelOpened(View arg0) { public void onPanelOpened(View arg0) {
paneShouldBeOpen = true; paneShouldBeOpen = true;
getActionBar().setDisplayHomeAsUpEnabled(false); getActionBar().setDisplayHomeAsUpEnabled(false);
getActionBar().setHomeButtonEnabled(false);
getActionBar().setTitle(R.string.app_name); getActionBar().setTitle(R.string.app_name);
invalidateOptionsMenu(); invalidateOptionsMenu();
hideKeyboard(); hideKeyboard();
@ -273,6 +274,7 @@ public class ConversationActivity extends XmppActivity {
if ((conversationList.size() > 0) if ((conversationList.size() > 0)
&& (getSelectedConversation() != null)) { && (getSelectedConversation() != null)) {
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setDisplayHomeAsUpEnabled(true);
getActionBar().setHomeButtonEnabled(true);
getActionBar().setTitle( getActionBar().setTitle(
getSelectedConversation().getName(useSubject)); getSelectedConversation().getName(useSubject));
invalidateOptionsMenu(); invalidateOptionsMenu();

1
src/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -527,6 +527,7 @@ public class ConversationFragment extends Fragment {
if (!activity.shouldPaneBeOpen()) { if (!activity.shouldPaneBeOpen()) {
activity.getSlidingPaneLayout().closePane(); activity.getSlidingPaneLayout().closePane();
activity.getActionBar().setDisplayHomeAsUpEnabled(true); activity.getActionBar().setDisplayHomeAsUpEnabled(true);
activity.getActionBar().setHomeButtonEnabled(true);
activity.getActionBar().setTitle( activity.getActionBar().setTitle(
conversation.getName(useSubject)); conversation.getName(useSubject));
activity.invalidateOptionsMenu(); activity.invalidateOptionsMenu();

8
src/eu/siacs/conversations/ui/ManageAccountActivity.java
View file

@ -380,6 +380,7 @@ public class ManageAccountActivity extends XmppActivity {
accountListViewAdapter.notifyDataSetChanged(); accountListViewAdapter.notifyDataSetChanged();
if ((this.accountList.size() == 0)&&(this.firstrun)) { if ((this.accountList.size() == 0)&&(this.firstrun)) {
getActionBar().setDisplayHomeAsUpEnabled(false); getActionBar().setDisplayHomeAsUpEnabled(false);
getActionBar().setHomeButtonEnabled(false);
addAccount(); addAccount();
this.firstrun = false; this.firstrun = false;
} }
@ -397,6 +398,12 @@ public class ManageAccountActivity extends XmppActivity {
case R.id.action_add_account: case R.id.action_add_account:
addAccount(); addAccount();
break; break;
case android.R.id.home:
if (xmppConnectionService.getConversations().size() == 0) {
startActivity(new Intent(getApplicationContext(),
ContactsActivity.class));
}
break;
default: default:
break; break;
} }
@ -429,6 +436,7 @@ public class ManageAccountActivity extends XmppActivity {
public void onAccountEdited(Account account) { public void onAccountEdited(Account account) {
xmppConnectionService.createAccount(account); xmppConnectionService.createAccount(account);
activity.getActionBar().setDisplayHomeAsUpEnabled(true); activity.getActionBar().setDisplayHomeAsUpEnabled(true);
activity.getActionBar().setHomeButtonEnabled(true);
} }
}); });
dialog.show(getFragmentManager(), "add_account"); dialog.show(getFragmentManager(), "add_account");