am 3f2069e6: Merge "Show the conversation list footer in spinny mode when the cursor is null" into jb-ub-mail-ur10
* commit '3f2069e6d21827efaa5f6d16ca0a8630c2a7b8e1':
Show the conversation list footer in spinny mode when the cursor is null
diff --git a/src/com/android/mail/browse/ConversationListFooterView.java b/src/com/android/mail/browse/ConversationListFooterView.java
index e02bd5c..68ef616 100644
--- a/src/com/android/mail/browse/ConversationListFooterView.java
+++ b/src/com/android/mail/browse/ConversationListFooterView.java
@@ -100,7 +100,10 @@
*/
public boolean updateStatus(final ConversationCursor cursor) {
if (cursor == null) {
- return false;
+ mLoading.setVisibility(View.VISIBLE);
+ mNetworkError.setVisibility(View.GONE);
+ mLoadMore.setVisibility(View.GONE);
+ return true;
}
boolean showFooter = true;
final Bundle extras = cursor.getExtras();
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 20a7c9f..6a61007 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -851,7 +851,7 @@
*/
public void onConversationListStatusUpdated() {
final ConversationCursor cursor = getConversationListCursor();
- final boolean showFooter = cursor != null && mFooterView.updateStatus(cursor);
+ final boolean showFooter = mFooterView.updateStatus(cursor);
// Update the folder status, in case the cursor could affect it.
onFolderStatusUpdated();
mListAdapter.setFooterVisibility(showFooter);