commit 01668eb393deaf8c8b8abf86be46109614a98631
author Mindy Pereira <mindyp@google.com> Wed Feb 15 19:19:05 2012 -0800
committer Mindy Pereira <mindyp@google.com> Wed Feb 15 19:20:11 2012 -0800
tree a8574724bbc95ee3ad92bb6b2dba2d468ab23c54
parent 9b87568c9e9f1c32a9672b315229866a58a1e757

Give the test app a more reasonable back stack.

We need to track the previous transactions, but at this point,
we are able to get back to the conversation list and then
back to the buttons activity.

Also, prevent double loading conversation list fragment
the first time we enter the activity.
Change-Id: Ie01e566d8e3846fceea70e4357da745abfe2793c

src/com/android/mail/ui/OnePaneController.java

diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 81fb76d..3ac3f95 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -18,6 +18,7 @@
 package com.android.mail.ui;
 
 import android.app.Fragment;
+import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -72,13 +73,6 @@
     @Override
     public void onViewModeChanged(int newMode) {
         super.onViewModeChanged(newMode);
-        if (newMode == ViewMode.CONVERSATION_LIST) {
-            // TODO(viki): Get name of inbox from the Account
-            final String inboxFolder = "inbox";
-            ConversationListContext listContext = ConversationListContext.forFolder(mContext,
-                    mAccount, inboxFolder);
-            showConversationList(listContext);
-        }
 
         // We don't want to invalidate the options menu when switching to conversation
         // mode, as it will happen when the conversation finishes loading.
@@ -89,6 +83,8 @@
 
     @Override
     public void showConversationList(ConversationListContext listContext) {
+        mViewMode.enterConversationListMode();
+
         FragmentTransaction fragmentTransaction = mActivity.getFragmentManager().beginTransaction();
         fragmentTransaction.addToBackStack(null);
         final boolean accountChanged = false;
@@ -102,7 +98,7 @@
         }
         fragmentTransaction.setTransition(transition);
 
-        Fragment conversationListFragment = ConversationListFragment.newInstance(mConvListContext);
+        Fragment conversationListFragment = ConversationListFragment.newInstance(listContext);
         fragmentTransaction.replace(R.id.content_pane, conversationListFragment);
 
         fragmentTransaction.commitAllowingStateLoss();
@@ -111,11 +107,13 @@
 
     @Override
     public void showConversation(Conversation conversation) {
+        mViewMode.enterConversationMode();
         replaceFragment(ConversationViewFragment.newInstance(mAccount, conversation));
     }
 
     @Override
     public void showFolderList() {
+        mViewMode.enterFolderListMode();
         replaceFragment(FolderListFragment.newInstance(this, mAccount.folderListUri));
     }
 
@@ -130,4 +128,19 @@
         fragmentTransaction.commitAllowingStateLoss();
         resetActionBarIcon();
     }
+
+    @Override
+    public boolean onBackPressed() {
+        // TODO: (mindyp) We have just 1 item on the back stack, so just pop
+        // back out to the start screen in this app. We won't need this once we
+        // remove the starting buttons screen.
+        int mode = mViewMode.getMode();
+        if (mode == ViewMode.CONVERSATION_LIST) {
+            mActivity.finish();
+            return true;
+        } else if (mode == ViewMode.CONVERSATION || mode == ViewMode.FOLDER_LIST) {
+            mViewMode.enterConversationListMode();
+        }
+        return false;
+    }
 }