am 71fdc400: Merge "Fix folder & account name not showing on back" into jb-ub-mail-ur9
* commit '71fdc400047182200d8e7eeac582c8f9d7241a3b':
Fix folder & account name not showing on back
diff --git a/src/com/android/mail/browse/ConversationPagerController.java b/src/com/android/mail/browse/ConversationPagerController.java
index 21cf6b9..ab81016 100644
--- a/src/com/android/mail/browse/ConversationPagerController.java
+++ b/src/com/android/mail/browse/ConversationPagerController.java
@@ -157,7 +157,7 @@
mPager.setVisibility(View.GONE);
}
- mSubjectDisplayChanger.clearSubject();
+ mSubjectDisplayChanger.clearSubjectAndUpdate();
LogUtils.d(LOG_TAG, "IN CPC.hide, clearing adapter and unregistering list observer");
mPager.setAdapter(null);
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 9e94d33..55066bd 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -655,14 +655,14 @@
}
@Override
- public void clearSubject() {
+ public void clearSubjectAndUpdate() {
if (!mShowConversationSubject) {
return;
}
-
- mActionBar.setTitle(null);
- mActionBar.setSubtitle(null);
+ // Wipe subject view text
mSubjectView.setText(null);
+ // Set folder and account as title and subtitle
+ setFolderAndAccount();
}
@Override
diff --git a/src/com/android/mail/ui/SubjectDisplayChanger.java b/src/com/android/mail/ui/SubjectDisplayChanger.java
index 29ccef5..6a19c9a 100644
--- a/src/com/android/mail/ui/SubjectDisplayChanger.java
+++ b/src/com/android/mail/ui/SubjectDisplayChanger.java
@@ -31,9 +31,10 @@
void setSubject(String subject);
/**
- * Clear the subject display.
+ * Clear the subject display and update the action bar to display the
+ * folder/account.
*/
- void clearSubject();
+ void clearSubjectAndUpdate();
/**
* Fits the subject text into the view that will display it, and returns any text that