moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-24 10:22:15 -05:00
Code Issues Releases Wiki Activity

Make the icon up navigation work in messagelist when displaying a query, tapping it takes you back to the account screen.

Browse Source
This commit is contained in:
Sander Bogaert 2012-08-02 10:14:16 -04:00 committed by Andrew Chen
parent 6daa8a3c0c
commit f530af7f8b
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/fsck/k9/activity/MessageList.java
View File

@ -673,7 +673,7 @@ public class MessageList extends K9ListActivity implements
mInflater = getLayoutInflater(); mInflater = getLayoutInflater();
mActionBar = getSupportActionBar(); mActionBar = getSupportActionBar();
if (mQueryString == null) initializeActionBar(); initializeActionBar();
initializeLayout(); initializeLayout();
// Only set "touchable" when we're first starting up the activity. // Only set "touchable" when we're first starting up the activity.
@ -905,11 +905,14 @@ public class MessageList extends K9ListActivity implements
} }
private void initializeActionBar() { private void initializeActionBar() {
if (mQueryString == null) {
mActionBar.setDisplayShowTitleEnabled(false);
mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
mNavigationSpinner = ActionBarNavigationSpinner.getDefaultSpinner(this);
mActionBar.setListNavigationCallbacks(mNavigationSpinner, this);
}
mActionBar.setDisplayHomeAsUpEnabled(true); mActionBar.setDisplayHomeAsUpEnabled(true);
mActionBar.setDisplayShowTitleEnabled(false);
mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
mNavigationSpinner = ActionBarNavigationSpinner.getDefaultSpinner(this);
mActionBar.setListNavigationCallbacks(mNavigationSpinner, this);
} }
private void initializeLayout() { private void initializeLayout() {
@ -1448,7 +1451,11 @@ public class MessageList extends K9ListActivity implements
int itemId = item.getItemId(); int itemId = item.getItemId();
switch (itemId) { switch (itemId) {
case android.R.id.home: { case android.R.id.home: {
onShowFolderList(); if (mQueryString == null) {
onShowFolderList();
} else {
onAccounts();
}
return true; return true;
} }
case R.id.compose: { case R.id.compose: {