commit c6041385db9eec53ab1d979bdf1262762fa6d2d4
author Marc Blank <mblank@google.com> Thu Apr 05 11:38:33 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 05 11:38:33 2012 -0700
tree 3826f9c579687c96e770ce261ae38dc7c8e55363
parent 90fc0ffa0ad4fcde94fa9648df7f8041bfb6a943
parent 547daf34cef7d1a9cd5b755e9401120c5c5446b2

Merge "Log stack traces if apply() called off of ui thread"

src/com/android/mail/browse/ConversationItemView.java

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();

src/com/android/mail/ui/AnimatedAdapter.java

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;