From 2521e032a78d9b34015143368ff6ef696944957d Mon Sep 17 00:00:00 2001 From: Bao-Long Nguyen-Trong Date: Fri, 26 Jun 2009 18:15:41 +0000 Subject: [PATCH] Fixed issue 522 and some minor navigation issue --- src/com/android/email/activity/FolderList.java | 5 +++-- src/com/android/email/activity/MessageList.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/activity/FolderList.java b/src/com/android/email/activity/FolderList.java index 611acfd52..2fe043d0b 100644 --- a/src/com/android/email/activity/FolderList.java +++ b/src/com/android/email/activity/FolderList.java @@ -346,7 +346,7 @@ public class FolderList extends K9ListActivity { } public static void actionHandleAccount(Context context, Account account, String initialFolder) { - actionHandleAccount(context, account, null, false); + actionHandleAccount(context, account, initialFolder, false); } public static void actionHandleAccount(Context context, Account account, boolean startup) { @@ -533,7 +533,8 @@ public class FolderList extends K9ListActivity { private void onAccounts() { // If we're a child activity (say because Welcome dropped us straight to the message list // we won't have a parent activity and we'll need to get back to it - if (mStartup) { + if (mStartup + || isTaskRoot()) { startActivity(new Intent(this, Accounts.class)); } finish(); diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java index fba4c83d4..12817d7b1 100644 --- a/src/com/android/email/activity/MessageList.java +++ b/src/com/android/email/activity/MessageList.java @@ -599,7 +599,8 @@ public class MessageList extends K9ListActivity { private void onShowFolderList() { // If we're a child activity (say because Welcome dropped us straight to the message list // we won't have a parent activity and we'll need to get back to it - if (mStartup) { + if (mStartup + || isTaskRoot()) { FolderList.actionHandleAccount(this, mAccount, false); } finish();