Revert "Disable refreshing from the UI for Drafts folders"
This reverts commit 8e31cca93589aa86161f0f73a2a2f84b456b8be7.
Bug: 11675414
Change-Id: I63ceb185bf47882e3fafdea9e97cd11da6d37829
diff --git a/src/com/android/mail/ui/ConversationListView.java b/src/com/android/mail/ui/ConversationListView.java
index 8795b8b..d4cca44 100644
--- a/src/com/android/mail/ui/ConversationListView.java
+++ b/src/com/android/mail/ui/ConversationListView.java
@@ -27,8 +27,6 @@
import com.android.mail.analytics.Analytics;
import com.android.mail.preferences.AccountPreferences;
import com.android.mail.preferences.MailPrefs;
-import com.android.mail.providers.UIProvider.FolderCapabilities;
-import com.android.mail.providers.UIProvider.FolderType;
import com.android.mail.ui.ConversationSyncDisabledTipView.ReasonSyncOff;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
@@ -80,8 +78,8 @@
private float mDensity;
private ControllableActivity mActivity;
- private final WindowManager mWindowManager;
- private final HintText mHintText;
+ private WindowManager mWindowManager;
+ private HintText mHintText;
private boolean mHasHintTextViewBeenAdded = false;
// Minimum vertical distance (in dips) of swipe to trigger a sync.
@@ -205,17 +203,6 @@
break;
case MotionEvent.ACTION_MOVE:
if (mTrackingScrollMovement) {
- if (mActivity.getFolderController().getFolder().isDraft()) {
- // Don't allow refreshing of DRAFT folders. See b/11158759
- LogUtils.d(LOG_TAG, "ignoring swipe to refresh on DRAFT folder");
- break;
- }
- if (mActivity.getFolderController().getFolder().supportsCapability(
- FolderCapabilities.IS_VIRTUAL)) {
- // Don't allow refreshing of virtual folders.
- LogUtils.d(LOG_TAG, "ignoring swipe to refresh on virtual folder");
- break;
- }
// Sync is triggered when tap and drag distance goes over a certain threshold
float verticalDistancePx = y - mTrackingScrollStartY;
float verticalDistanceDp = verticalDistancePx / mDensity;
@@ -426,7 +413,7 @@
// Can be one of NONE, SWIPE_TO_REFRESH, CHECKING_FOR_MAIL
private int mDisplay;
- private final TextView mTextView;
+ private TextView mTextView;
private final Interpolator mDecelerateInterpolator = new DecelerateInterpolator(1.5f);
private final Interpolator mAccelerateInterpolator = new AccelerateInterpolator(1.5f);
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index c809ec7..cfd1144 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -90,7 +90,6 @@
private SearchView mSearchWidget;
private MenuItem mHelpItem;
private MenuItem mSendFeedbackItem;
- private MenuItem mRefreshItem;
private MenuItem mFolderSettingsItem;
private MenuItem mEmptyTrashItem;
private MenuItem mEmptySpamItem;
@@ -240,7 +239,6 @@
}
mHelpItem = menu.findItem(R.id.help_info_menu_item);
mSendFeedbackItem = menu.findItem(R.id.feedback_menu_item);
- mRefreshItem = menu.findItem(R.id.refresh);
mFolderSettingsItem = menu.findItem(R.id.folder_options);
mEmptyTrashItem = menu.findItem(R.id.empty_trash);
mEmptySpamItem = menu.findItem(R.id.empty_spam);
@@ -389,15 +387,6 @@
}
return false;
}
-
- if (mRefreshItem != null) {
- // See b/11158759
- // Disable refresh on drafts folders.
- mRefreshItem.setVisible(mFolder != null &&
- !mFolder.isDraft() &&
- !mFolder.supportsCapability(FolderCapabilities.IS_VIRTUAL));
- }
-
if (mFolderSettingsItem != null) {
mFolderSettingsItem.setVisible(mFolder != null
&& mFolder.supportsCapability(FolderCapabilities.SUPPORTS_SETTINGS));
