Fixes issue with incorrect menu showing when returning from folder list.
Repro steps:
from inbox, tap "show all labels"
press up or back
still shows folder management action bar
Change-Id: Ie4787448b4f3d4010c5eda59bbdc248ab22c39ad
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index f2bcd3a..9074050 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -205,6 +205,7 @@
}
private void transitionToInbox() {
+ mViewMode.enterConversationListMode();
ConversationListContext listContext = ConversationListContext.forFolder(mContext,
mAccount, mInbox);
// Set the correct context for what the conversation view will be now.
@@ -244,9 +245,9 @@
}
private void transitionBackToConversationListMode() {
+ mViewMode.enterConversationListMode();
mActivity.getFragmentManager().popBackStack(mLastConversationTransactionId,
FragmentManager.POP_BACK_STACK_INCLUSIVE);
- mViewMode.enterConversationListMode();
resetActionBarIcon();
}
}