Merge "Cleanup and collapse some methods together."

src/com/android/email/activity/UIControllerBase.java

@@ -183,6 +183,7 @@ abstract class UIControllerBase implements MailboxListFragment.Callback,
             startInboxLookup(mInboxLookupAccountId);
             mResumeInboxLookup = false;
         }
+        refreshActionBar();
     }
 
     /**
@@ -669,6 +670,17 @@ abstract class UIControllerBase implements MailboxListFragment.Callback,
         return true;
     }
 
+    /**
+     * @return the ID of the message in focus and visible, if any. Returns
+     *     {@link Message#NO_MESSAGE} if no message is opened.
+     */
+    protected long getMessageId() {
+        return isMessageViewInstalled()
+                ? getMessageViewFragment().getMessageId()
+                : Message.NO_MESSAGE;
+    }
+
+
     /**
      * STOPSHIP For experimental UI.  Remove this.
      *

src/com/android/email/activity/UIControllerOnePane.java

@@ -223,8 +223,8 @@ class UIControllerOnePane extends UIControllerBase {
 
         @Override
         public boolean shouldShowUp() {
-            return isMessageViewVisible()
-                     || (isMailboxListVisible() && !getMailboxListFragment().isRoot());
+            return isMessageViewInstalled()
+                     || (isMailboxListInstalled() && !getMailboxListFragment().isRoot());
         }
 
         @Override
@@ -313,37 +313,16 @@ class UIControllerOnePane extends UIControllerBase {
         super.onActivityCreated();
     }
 
-    @Override
-    public void onActivityResume() {
-        super.onActivityResume();
-        refreshActionBar();
-    }
-
-    /** @return true if a {@link MailboxListFragment} is installed and visible. */
-    private final boolean isMailboxListVisible() {
-        return isMailboxListInstalled();
-    }
-
-    /** @return true if a {@link MessageListFragment} is installed and visible. */
-    private final boolean isMessageListVisible() {
-        return isMessageListInstalled();
-    }
-
-    /** @return true if a {@link MessageViewFragment} is installed and visible. */
-    private final boolean isMessageViewVisible() {
-        return isMessageViewInstalled();
-    }
-
     @Override
     public long getUIAccountId() {
         // Get it from the visible fragment.
-        if (isMailboxListVisible()) {
+        if (isMailboxListInstalled()) {
             return getMailboxListFragment().getAccountId();
         }
-        if (isMessageListVisible()) {
+        if (isMessageListInstalled()) {
             return getMessageListFragment().getAccountId();
         }
-        if (isMessageViewVisible()) {
+        if (isMessageViewInstalled()) {
             return getMessageViewFragment().getOpenerAccountId();
         }
         return Account.NO_ACCOUNT;
@@ -351,23 +330,15 @@ class UIControllerOnePane extends UIControllerBase {
 
     private long getMailboxId() {
         // Get it from the visible fragment.
-        if (isMessageListVisible()) {
+        if (isMessageListInstalled()) {
             return getMessageListFragment().getMailboxId();
         }
-        if (isMessageViewVisible()) {
+        if (isMessageViewInstalled()) {
             return getMessageViewFragment().getOpenerMailboxId();
         }
         return Mailbox.NO_MAILBOX;
     }
 
-    private long getMessageId() {
-        // Get it from the visible fragment.
-        if (isMessageViewVisible()) {
-            return getMessageViewFragment().getMessageId();
-        }
-        return Message.NO_MESSAGE;
-    }
-
     @Override
     public boolean onBackPressed(boolean isSystemBackKey) {
         if (Email.DEBUG) {
@@ -636,7 +607,7 @@ class UIControllerOnePane extends UIControllerBase {
         // Refreshable only when an actual account is selected, and message view isn't shown.
         // (i.e. only available on the mailbox list or the message view, but not on the combined
         // one)
-        return isActualAccountSelected() && !isMessageViewVisible();
+        return isActualAccountSelected() && !isMessageViewInstalled();
     }
 
     @Override
@@ -644,7 +615,7 @@ class UIControllerOnePane extends UIControllerBase {
         if (!isRefreshEnabled()) {
             return;
         }
-        if (isMessageListVisible()) {
+        if (isMessageListInstalled()) {
             mRefreshManager.refreshMessageList(getActualAccountId(), getMailboxId(), true);
         } else {
             mRefreshManager.refreshMailboxList(getActualAccountId());
@@ -656,7 +627,7 @@ class UIControllerOnePane extends UIControllerBase {
         if (!isRefreshEnabled()) {
             return false;
         }
-        if (isMessageListVisible()) {
+        if (isMessageListInstalled()) {
             return mRefreshManager.isMessageListRefreshing(getMailboxId());
         } else {
             return mRefreshManager.isMailboxListRefreshing(getActualAccountId());

src/com/android/email/activity/UIControllerTwoPane.java

@@ -371,11 +371,6 @@ class UIControllerTwoPane extends UIControllerBase implements
         return getMessageListMailboxId();
     }
 
-    private long getMessageId() {
-        return isMessageViewInstalled() ? getMessageViewFragment().getMessageId()
-                : Message.NO_MESSAGE;
-    }
-
     /**
      * @return true if refresh is in progress for the current mailbox.
      */
@@ -413,13 +408,6 @@ class UIControllerTwoPane extends UIControllerBase implements
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void onActivityResume() {
-        super.onActivityResume();
-        refreshActionBar();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void onActivityPause() {