Default to showing checkboxes as we have issue around settings not being there on orientaiton changes.
This is the safer alternative while we work out those issues.
Fixes b/6297162 Check box is not displayed in the Inbox for multi-select operations
Change-Id: I587d729df987988555078ad954ec669141e4bff3
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index af22776..a6a6816 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -362,12 +362,12 @@
}
public void bind(Cursor cursor, ViewMode viewMode, ConversationSelectionSet set,
- Folder folder, boolean checkboxesEnabled, boolean swipeEnabled) {
+ Folder folder, boolean checkboxesDisabled, boolean swipeEnabled) {
mViewMode = viewMode;
mHeader = ConversationItemViewModel.forCursor(cursor);
mSelectedConversationSet = set;
mDisplayedFolder = folder;
- mCheckboxesEnabled = checkboxesEnabled;
+ mCheckboxesEnabled = !checkboxesDisabled;
mSwipeEnabled = swipeEnabled;
setContentDescription(mHeader.getContentDescription(mContext));
requestLayout();
@@ -375,12 +375,12 @@
public void bind(Conversation conversation, ViewMode viewMode, ConversationSelectionSet set,
- Folder folder, boolean checkboxesEnabled, boolean swipeEnabled) {
+ Folder folder, boolean checkboxesDisabled, boolean swipeEnabled) {
mViewMode = viewMode;
mHeader = ConversationItemViewModel.forConversation(conversation);
mSelectedConversationSet = set;
mDisplayedFolder = folder;
- mCheckboxesEnabled = checkboxesEnabled;
+ mCheckboxesEnabled = !checkboxesDisabled;
mSwipeEnabled = swipeEnabled;
setContentDescription(mHeader.getContentDescription(mContext));
requestLayout();
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 1e8f068..97c31df 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -113,7 +113,7 @@
public void bindView(View view, Context context, Cursor cursor) {
if (!isPositionAnimating(view) && !isPositionFooter(view)) {
((ConversationItemView) view).bind(cursor, mViewMode, mBatchConversations, mFolder,
- mCachedSettings != null ? !mCachedSettings.hideCheckboxes : false,
+ mCachedSettings != null ? mCachedSettings.hideCheckboxes : false,
mSwipeEnabled);
}
}
@@ -253,7 +253,7 @@
ConversationItemView convView = (ConversationItemView) super.getView(position, null,
parent);
convView.bind(conversation, mViewMode, mBatchConversations, mFolder,
- mCachedSettings != null ? !mCachedSettings.hideCheckboxes : false,
+ mCachedSettings != null ? mCachedSettings.hideCheckboxes : false,
mSwipeEnabled);
convView.startUndoAnimation(mViewMode, this);
return convView;