DO NOT MERGE Revert "Change "hide checkboxes" to "show checkboxes""
This reverts commit e7b31afacb4779e0af5a23413b96453979a852a4.
diff --git a/src/com/android/mail/providers/MailAppProvider.java b/src/com/android/mail/providers/MailAppProvider.java
index 798c446..587170d 100644
--- a/src/com/android/mail/providers/MailAppProvider.java
+++ b/src/com/android/mail/providers/MailAppProvider.java
@@ -295,8 +295,8 @@
case UIProvider.ACCOUNT_SETTINGS_REPLY_BEHAVIOR_COLUMN:
builder.add(Integer.valueOf(account.settings.replyBehavior));
break;
- case UIProvider.ACCOUNT_SETTINGS_SHOW_CHECKBOXES_COLUMN:
- builder.add(Integer.valueOf(account.settings.showCheckboxes ? 1 : 0));
+ case UIProvider.ACCOUNT_SETTINGS_HIDE_CHECKBOXES_COLUMN:
+ builder.add(Integer.valueOf(account.settings.hideCheckboxes ? 1 : 0));
break;
case UIProvider.ACCOUNT_SETTINGS_CONFIRM_DELETE_COLUMN:
builder.add(Integer.valueOf(account.settings.confirmDelete ? 1 : 0));
diff --git a/src/com/android/mail/providers/Settings.java b/src/com/android/mail/providers/Settings.java
index d37bab1..b77a19d 100644
--- a/src/com/android/mail/providers/Settings.java
+++ b/src/com/android/mail/providers/Settings.java
@@ -66,7 +66,7 @@
public final int messageTextSize;
public final int snapHeaders;
public final int replyBehavior;
- public final boolean showCheckboxes;
+ public final boolean hideCheckboxes;
public final boolean confirmDelete;
public final boolean confirmArchive;
public final boolean confirmSend;
@@ -101,7 +101,7 @@
messageTextSize = MessageTextSize.NORMAL;
snapHeaders = SnapHeaderValue.ALWAYS;
replyBehavior = DefaultReplyBehavior.REPLY;
- showCheckboxes = false;
+ hideCheckboxes = false;
confirmDelete = false;
confirmArchive = false;
confirmSend = false;
@@ -122,7 +122,7 @@
messageTextSize = inParcel.readInt();
snapHeaders = inParcel.readInt();
replyBehavior = inParcel.readInt();
- showCheckboxes = inParcel.readInt() != 0;
+ hideCheckboxes = inParcel.readInt() != 0;
confirmDelete = inParcel.readInt() != 0;
confirmArchive = inParcel.readInt() != 0;
confirmSend = inParcel.readInt() != 0;
@@ -143,7 +143,7 @@
messageTextSize = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_MESSAGE_TEXT_SIZE_COLUMN);
snapHeaders = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_SNAP_HEADERS_COLUMN);
replyBehavior = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_REPLY_BEHAVIOR_COLUMN);
- showCheckboxes = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_SHOW_CHECKBOXES_COLUMN) != 0;
+ hideCheckboxes = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_HIDE_CHECKBOXES_COLUMN) != 0;
confirmDelete = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_CONFIRM_DELETE_COLUMN) != 0;
confirmArchive = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_CONFIRM_ARCHIVE_COLUMN) != 0;
confirmSend = cursor.getInt(UIProvider.ACCOUNT_SETTINGS_CONFIRM_SEND_COLUMN) != 0;
@@ -173,8 +173,8 @@
sDefault.snapHeaders);
replyBehavior = json.optInt(AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
sDefault.replyBehavior);
- showCheckboxes = json.optBoolean(AccountColumns.SettingsColumns.SHOW_CHECKBOXES,
- sDefault.showCheckboxes);
+ hideCheckboxes = json.optBoolean(AccountColumns.SettingsColumns.HIDE_CHECKBOXES,
+ sDefault.hideCheckboxes);
confirmDelete = json.optBoolean(AccountColumns.SettingsColumns.CONFIRM_DELETE,
sDefault.confirmDelete);
confirmArchive = json.optBoolean(AccountColumns.SettingsColumns.CONFIRM_ARCHIVE,
@@ -228,7 +228,7 @@
json.put(AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE, messageTextSize);
json.put(AccountColumns.SettingsColumns.SNAP_HEADERS, snapHeaders);
json.put(AccountColumns.SettingsColumns.REPLY_BEHAVIOR, replyBehavior);
- json.put(AccountColumns.SettingsColumns.SHOW_CHECKBOXES, showCheckboxes);
+ json.put(AccountColumns.SettingsColumns.HIDE_CHECKBOXES, hideCheckboxes);
json.put(AccountColumns.SettingsColumns.CONFIRM_DELETE, confirmDelete);
json.put(AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, confirmArchive);
json.put(AccountColumns.SettingsColumns.CONFIRM_SEND, confirmSend);
@@ -298,7 +298,7 @@
dest.writeInt(messageTextSize);
dest.writeInt(snapHeaders);
dest.writeInt(replyBehavior);
- dest.writeInt(showCheckboxes ? 1 : 0);
+ dest.writeInt(hideCheckboxes ? 1 : 0);
dest.writeInt(confirmDelete ? 1 : 0);
dest.writeInt(confirmArchive? 1 : 0);
dest.writeInt(confirmSend? 1 : 0);
@@ -391,7 +391,7 @@
&& messageTextSize == that.messageTextSize
&& snapHeaders == that.snapHeaders
&& replyBehavior == that.replyBehavior
- && showCheckboxes == that.showCheckboxes
+ && hideCheckboxes == that.hideCheckboxes
&& confirmDelete == that.confirmDelete
&& confirmArchive == that.confirmArchive
&& confirmSend == that.confirmSend
@@ -420,7 +420,7 @@
private final int calculateHashCode() {
return super.hashCode()
^ Objects.hashCode(signature, mAutoAdvance, mTransientAutoAdvance, messageTextSize,
- snapHeaders, replyBehavior, showCheckboxes, confirmDelete, confirmArchive,
+ snapHeaders, replyBehavior, hideCheckboxes, confirmDelete, confirmArchive,
confirmSend, defaultInbox, forceReplyFromDefault, maxAttachmentSize, swipe,
priorityArrowsEnabled, setupIntentUri, conversationViewMode,
veiledAddressPattern);
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 69b56aa..25da659 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -157,7 +157,7 @@
.put(AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE, Integer.class)
.put(AccountColumns.SettingsColumns.SNAP_HEADERS, Integer.class)
.put(AccountColumns.SettingsColumns.REPLY_BEHAVIOR, Integer.class)
- .put(AccountColumns.SettingsColumns.SHOW_CHECKBOXES, Integer.class)
+ .put(AccountColumns.SettingsColumns.HIDE_CHECKBOXES, Integer.class)
.put(AccountColumns.SettingsColumns.CONFIRM_DELETE, Integer.class)
.put(AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, Integer.class)
.put(AccountColumns.SettingsColumns.CONFIRM_SEND, Integer.class)
@@ -209,7 +209,7 @@
public static final int ACCOUNT_SETTINGS_MESSAGE_TEXT_SIZE_COLUMN = 28;
public static final int ACCOUNT_SETTINGS_SNAP_HEADERS_COLUMN = 29;
public static final int ACCOUNT_SETTINGS_REPLY_BEHAVIOR_COLUMN = 30;
- public static final int ACCOUNT_SETTINGS_SHOW_CHECKBOXES_COLUMN = 31;
+ public static final int ACCOUNT_SETTINGS_HIDE_CHECKBOXES_COLUMN = 31;
public static final int ACCOUNT_SETTINGS_CONFIRM_DELETE_COLUMN = 32;
public static final int ACCOUNT_SETTINGS_CONFIRM_ARCHIVE_COLUMN = 33;
public static final int ACCOUNT_SETTINGS_CONFIRM_SEND_COLUMN = 34;
@@ -534,9 +534,9 @@
/**
* Integer column containing the user's specified checkbox preference. A
- * non zero value means to show checkboxes.
+ * non zero value means to hide checkboxes.
*/
- public static final String SHOW_CHECKBOXES = "show_checkboxes";
+ public static final String HIDE_CHECKBOXES = "hide_checkboxes";
/**
* Integer column containing the user's specified confirm delete preference value.
@@ -644,8 +644,8 @@
.put(AccountColumns.SettingsColumns.SNAP_HEADERS,ACCOUNT_SETTINGS_SNAP_HEADERS_COLUMN)
.put(AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
ACCOUNT_SETTINGS_REPLY_BEHAVIOR_COLUMN)
- .put(AccountColumns.SettingsColumns.SHOW_CHECKBOXES,
- ACCOUNT_SETTINGS_SHOW_CHECKBOXES_COLUMN)
+ .put(AccountColumns.SettingsColumns.HIDE_CHECKBOXES,
+ ACCOUNT_SETTINGS_HIDE_CHECKBOXES_COLUMN)
.put(AccountColumns.SettingsColumns.CONFIRM_DELETE,
ACCOUNT_SETTINGS_CONFIRM_DELETE_COLUMN)
.put(AccountColumns.SettingsColumns.CONFIRM_ARCHIVE,
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index e320ac3..d456783 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -211,7 +211,7 @@
view = new SwipeableConversationItemView(context, mAccount.name);
}
view.bind(conv, mActivity, mBatchConversations, mFolder,
- mAccount != null ? !mAccount.settings.showCheckboxes : false, mSwipeEnabled,
+ mAccount != null ? mAccount.settings.hideCheckboxes : false, mSwipeEnabled,
mPriorityMarkersEnabled, this);
return view;
}
@@ -541,7 +541,7 @@
return;
}
((SwipeableConversationItemView) view).bind(cursor, mActivity, mBatchConversations, mFolder,
- mAccount != null ? !mAccount.settings.showCheckboxes : false,
+ mAccount != null ? mAccount.settings.hideCheckboxes : false,
mSwipeEnabled, mPriorityMarkersEnabled, this);
}
@@ -551,7 +551,7 @@
position, null, parent);
view.reset();
view.bind(conversation, mActivity, mBatchConversations, mFolder,
- mAccount != null ? !mAccount.settings.showCheckboxes : false, mSwipeEnabled,
+ mAccount != null ? mAccount.settings.hideCheckboxes : false, mSwipeEnabled,
mPriorityMarkersEnabled, this);
mAnimatingViews.put(conversation.id, view);
return view;
@@ -797,4 +797,4 @@
item.cancelFadeOutText();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 12f31fa..e497d42 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -435,7 +435,7 @@
if (!(view instanceof ToggleableItem)) {
return;
}
- if (!mAccount.settings.showCheckboxes && !mSelectedSet.isEmpty()) {
+ if (mAccount.settings.hideCheckboxes && !mSelectedSet.isEmpty()) {
ToggleableItem v = (ToggleableItem) view;
v.toggleCheckMarkOrBeginDrag();
} else {