am 67d30cc0: am fc4015c6: Merge "Remove retry UI state and enable delete for sending" into ub-gmail-ur14-dev
* commit '67d30cc065c8b35fe1d7210c4d9a55974d4f9373':
Remove retry UI state and enable delete for sending
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 6770c3a..724125e 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -525,10 +525,8 @@
switch (mSendingState) {
case UIProvider.ConversationSendingState.QUEUED:
case UIProvider.ConversationSendingState.SENDING:
- title = getResources().getString(R.string.sending);
- break;
case UIProvider.ConversationSendingState.RETRYING:
- title = getResources().getString(R.string.message_retrying);
+ title = getResources().getString(R.string.sending);
break;
case UIProvider.ConversationSendingState.SEND_ERROR:
title = getResources().getString(R.string.message_failed);
diff --git a/src/com/android/mail/browse/SelectedConversationsActionMenu.java b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
index dabb31e..921a80a 100644
--- a/src/com/android/mail/browse/SelectedConversationsActionMenu.java
+++ b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
@@ -466,7 +466,6 @@
mDiscardOutboxMenuItem = menu.findItem(R.id.discard_outbox);
if (mDiscardOutboxMenuItem != null) {
mDiscardOutboxMenuItem.setVisible(shouldShowDiscardOutbox);
- mDiscardOutboxMenuItem.setEnabled(shouldEnableDiscardOutbox(conversations));
}
final boolean showDelete = mFolder != null && !mFolder.isType(FolderType.OUTBOX)
&& mFolder.supportsCapability(UIProvider.FolderCapabilities.DELETE);
@@ -485,18 +484,6 @@
return true;
}
- private boolean shouldEnableDiscardOutbox(Collection<Conversation> conversations) {
- boolean shouldEnableDiscardOutbox = true;
- // Java should be smart enough to realize that once showDiscardOutbox becomes false it can
- // just skip everything remaining in the for-loop..
- for (Conversation conv : conversations) {
- shouldEnableDiscardOutbox &=
- conv.sendingState != UIProvider.ConversationSendingState.SENDING &&
- conv.sendingState != UIProvider.ConversationSendingState.RETRYING;
- }
- return shouldEnableDiscardOutbox;
- }
-
@Override
public void onDestroyActionMode(ActionMode mode) {
mActionMode = null;
@@ -532,10 +519,6 @@
return;
}
updateCount();
-
- if (mFolder.isType(FolderType.OUTBOX) && mDiscardOutboxMenuItem != null) {
- mDiscardOutboxMenuItem.setEnabled(shouldEnableDiscardOutbox(set.values()));
- }
}
/**
diff --git a/src/com/android/mail/browse/SendersView.java b/src/com/android/mail/browse/SendersView.java
index a78d37b..6ce12cb 100644
--- a/src/com/android/mail/browse/SendersView.java
+++ b/src/com/android/mail/browse/SendersView.java
@@ -192,8 +192,8 @@
statusText = sSendingString;
span = sSendingStyleSpan;
} else if (sendingStatus == UIProvider.ConversationSendingState.RETRYING) {
- statusText = sRetryingString;
- span = sRetryingStyleSpan;
+ statusText = sSendingString;
+ span = sSendingStyleSpan;
} else {
statusText = sFailedString;
span = sFailedStyleSpan;
diff --git a/src/com/android/mail/browse/SwipeableConversationItemView.java b/src/com/android/mail/browse/SwipeableConversationItemView.java
index 866653a..10657f4 100644
--- a/src/com/android/mail/browse/SwipeableConversationItemView.java
+++ b/src/com/android/mail/browse/SwipeableConversationItemView.java
@@ -26,7 +26,6 @@
import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
-import com.android.mail.providers.UIProvider;
import com.android.mail.ui.AnimatedAdapter;
import com.android.mail.ui.ControllableActivity;
import com.android.mail.ui.ConversationCheckedSet;
@@ -58,14 +57,6 @@
final int checkboxOrSenderImage, boolean swipeEnabled,
final boolean importanceMarkersEnabled, final boolean showChevronsEnabled,
final AnimatedAdapter animatedAdapter) {
- // Only enable delete for failed items in the Outbox.
- // Necessary to do it here because Outbox is the only place where we selectively enable
- // swipe on a item-by-item basis.
- if (folder.isType(UIProvider.FolderType.OUTBOX)) {
- swipeEnabled &=
- conversation.sendingState != UIProvider.ConversationSendingState.SENDING &&
- conversation.sendingState != UIProvider.ConversationSendingState.RETRYING;
- }
mConversationItemView.bind(conversation, activity, set, folder, checkboxOrSenderImage,
swipeEnabled, importanceMarkersEnabled, showChevronsEnabled, animatedAdapter);
}
diff --git a/src/com/android/mail/ui/ActionBarController.java b/src/com/android/mail/ui/ActionBarController.java
index f842546..299f720 100644
--- a/src/com/android/mail/ui/ActionBarController.java
+++ b/src/com/android/mail/ui/ActionBarController.java
@@ -396,8 +396,7 @@
Utils.setMenuItemPresent(menu, R.id.mark_not_important, !showMarkImportant
&& mAccount.supportsCapability(UIProvider.AccountCapabilities.MARK_IMPORTANT));
final boolean isOutbox = mFolder.isType(FolderType.OUTBOX);
- final boolean showDiscardOutbox = mFolder != null && isOutbox &&
- mCurrentConversation.sendingState == UIProvider.ConversationSendingState.SEND_ERROR;
+ final boolean showDiscardOutbox = mFolder != null && isOutbox;
Utils.setMenuItemPresent(menu, R.id.discard_outbox, showDiscardOutbox);
final boolean showDelete = !isOutbox && mFolder != null &&
mFolder.supportsCapability(UIProvider.FolderCapabilities.DELETE);