ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 700fb3c2: Merge "Revert "Change "hide checkboxes" to "show checkboxes""" into jb-ub-mail-ur9

Browse Source 
* commit '700fb3c23d56a14eef9c330c50278f02935f5a04':
  Revert "Change "hide checkboxes" to "show checkboxes""
This commit is contained in:
Alice Yang 2013-03-13 21:33:10 +00:00 committed by Android Git Automerger
commit 6824d96831
5 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@ -1109,12 +1109,12 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- First category in general preferences [CHAR LIMIT=64] -->
<string name="category_general_preferences">Application</string>
<!-- General preference: Label of the setting for showing checkboxes in the
<!-- General preference: Label of the setting for hiding checkboxes in the
message list [CHAR LIMIT=32] -->
<string name="general_preference_show_checkboxes_label">Show checkboxes</string>
<!-- General preference: Description of the setting for showing checkboxes in the
<string name="general_preference_hide_checkboxes_label">Hide checkboxes</string>
<!-- General preference: Description of the setting for hiding checkboxes in the
message list [CHAR LIMIT=64] -->
<string name="general_preference_show_checkboxes_summary">In lists of messages, touch and
<string name="general_preference_hide_checkboxes_summary">In lists of messages, touch and
hold to select</string>
<!-- General preference: Label of the setting for requiring confirmation before
message deletion [CHAR LIMIT=32] -->

6
res/xml/general_preferences.xml
View File

@ -48,11 +48,11 @@
android:dialogTitle="@string/general_preference_text_zoom_dialog_title" />
<CheckBoxPreference
android:key="show_checkboxes"
android:key="hide_checkboxes"
android:persistent="true"
android:defaultValue="false"
android:title="@string/general_preference_show_checkboxes_label"
android:summary="@string/general_preference_show_checkboxes_summary" />
android:title="@string/general_preference_hide_checkboxes_label"
android:summary="@string/general_preference_hide_checkboxes_summary" />
<!-- This may be removed in GeneralPreferences.java -->
<CheckBoxPreference

12
src/com/android/email/Preferences.java
View File

@ -55,7 +55,7 @@ public class Preferences {
private static final String CONFIRM_SEND = "confirm_send";
@Deprecated
private static final String SWIPE_DELETE = "swipe_delete";
private static final String SHOW_CHECKBOXES = "show_checkboxes";
private static final String HIDE_CHECKBOXES = "hide_checkboxes";
public static final int AUTO_ADVANCE_NEWER = 0;
public static final int AUTO_ADVANCE_OLDER = 1;
@ -64,7 +64,7 @@ public class Preferences {
private static final int AUTO_ADVANCE_DEFAULT = AUTO_ADVANCE_OLDER;
private static final boolean CONFIRM_DELETE_DEFAULT = false;
private static final boolean CONFIRM_SEND_DEFAULT = false;
private static final boolean SHOW_CHECKBOXES_DEFAULT = false;
private static final boolean HIDE_CHECKBOXES_DEFAULT = false;
// The following constants are used as offsets into R.array.general_preference_text_zoom_size.
public static final int TEXT_ZOOM_TINY = 0;
@ -193,12 +193,12 @@ public class Preferences {
mSharedPreferences.edit().putInt(AUTO_ADVANCE_DIRECTION, direction).apply();
}
public boolean getShowCheckboxes() {
return mSharedPreferences.getBoolean(SHOW_CHECKBOXES, SHOW_CHECKBOXES_DEFAULT);
public boolean getHideCheckboxes() {
return mSharedPreferences.getBoolean(HIDE_CHECKBOXES, HIDE_CHECKBOXES_DEFAULT);
}
public void setShowCheckboxes(boolean set) {
mSharedPreferences.edit().putBoolean(SHOW_CHECKBOXES, set).apply();
public void setHideCheckboxes(boolean set) {
mSharedPreferences.edit().putBoolean(HIDE_CHECKBOXES, set).apply();
}
public boolean getConfirmDelete() {

11
src/com/android/email/activity/setup/GeneralPreferences.java
View File

@ -39,7 +39,8 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
private static final String PREFERENCE_KEY_TEXT_ZOOM = "text_zoom";
private static final String PREFERENCE_KEY_CONFIRM_DELETE = "confirm_delete";
private static final String PREFERENCE_KEY_CONFIRM_SEND = "confirm_send";
private static final String PREFERENCE_KEY_SHOW_CHECKBOXES = "show_checkboxes";
private static final String PREFERENCE_KEY_HIDE_CHECKBOXES = "hide_checkboxes";
private static final String PREFERENCE_KEY_SWIPE_DELETE = "swipe_delete";
private static final String PREFERENCE_KEY_CLEAR_TRUSTED_SENDERS = "clear_trusted_senders";
private MailPrefs mMailPrefs;
@ -53,7 +54,7 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
private ListPreference mTextZoom;
private CheckBoxPreference mConfirmDelete;
private CheckBoxPreference mConfirmSend;
private CheckBoxPreference mShowCheckboxes;
private CheckBoxPreference mHideCheckboxes;
private CheckBoxPreference mSwipeDelete;
private boolean mSettingsChanged = false;
@ -135,8 +136,8 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
} else if (PREFERENCE_KEY_CONFIRM_SEND.equals(key)) {
mPreferences.setConfirmSend(mConfirmSend.isChecked());
return true;
} else if (PREFERENCE_KEY_SHOW_CHECKBOXES.equals(key)) {
mPreferences.setShowCheckboxes(mShowCheckboxes.isChecked());
} else if (PREFERENCE_KEY_HIDE_CHECKBOXES.equals(key)) {
mPreferences.setHideCheckboxes(mHideCheckboxes.isChecked());
return true;
} else if (MailPrefs.PreferenceKeys.CONVERSATION_LIST_SWIPE_ACTION.equals(key)) {
mMailPrefs
@ -162,7 +163,7 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
mConfirmDelete = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_DELETE);
mConfirmSend = (CheckBoxPreference) findPreference(PREFERENCE_KEY_CONFIRM_SEND);
mShowCheckboxes = (CheckBoxPreference) findPreference(PREFERENCE_KEY_SHOW_CHECKBOXES);
mHideCheckboxes = (CheckBoxPreference) findPreference(PREFERENCE_KEY_HIDE_CHECKBOXES);
mSwipeDelete = (CheckBoxPreference)
findPreference(MailPrefs.PreferenceKeys.CONVERSATION_LIST_SWIPE_ACTION);
mSwipeDelete.setChecked(MailPrefs.ConversationListSwipeActions.DELETE.equals(

16
src/com/android/email/provider/EmailProvider.java
View File

@ -2856,9 +2856,9 @@ outer:
? SWIPE_DELETE : SWIPE_DISABLED);
}
if (projectionColumns.contains(
UIProvider.AccountColumns.SettingsColumns.SHOW_CHECKBOXES)) {
values.put(UIProvider.AccountColumns.SettingsColumns.SHOW_CHECKBOXES,
prefs.getShowCheckboxes() ? "1" : "0");
UIProvider.AccountColumns.SettingsColumns.HIDE_CHECKBOXES)) {
values.put(UIProvider.AccountColumns.SettingsColumns.HIDE_CHECKBOXES,
prefs.getHideCheckboxes() ? "1" : "0");
}
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) {
int autoAdvance = prefs.getAutoAdvanceDirection();
@ -3064,8 +3064,8 @@ outer:
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)] =
Integer.toString(UIProvider.DefaultReplyBehavior.REPLY);
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.SHOW_CHECKBOXES)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.SHOW_CHECKBOXES)] = 0;
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.HIDE_CHECKBOXES)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.HIDE_CHECKBOXES)] = 0;
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] =
@ -3079,9 +3079,9 @@ outer:
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_SEND)] =
prefs.getConfirmSend() ? 1 : 0;
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.SHOW_CHECKBOXES)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.SHOW_CHECKBOXES)] =
prefs.getShowCheckboxes() ? 1 : 0;
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.HIDE_CHECKBOXES)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.HIDE_CHECKBOXES)] =
prefs.getHideCheckboxes() ? 1 : 0;
}
if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.DEFAULT_INBOX)) {
values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.DEFAULT_INBOX)] =