diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 90c68b18b..4b955f416 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -85,11 +85,6 @@
-
-
-
diff --git a/src/com/fsck/k9/R.java b/src/com/fsck/k9/R.java
index c889201ce..572703812 100644
--- a/src/com/fsck/k9/R.java
+++ b/src/com/fsck/k9/R.java
@@ -209,119 +209,119 @@ public final class R {
public static final int message_view_option=0x7f090006;
}
public static final class string {
- public static final int account_delete_dlg_instructions_fmt=0x7f0600c6;
- public static final int account_delete_dlg_title=0x7f0600c5;
+ public static final int account_delete_dlg_instructions_fmt=0x7f0600c7;
+ public static final int account_delete_dlg_title=0x7f0600c6;
public static final int account_settings_action=0x7f06001b;
- public static final int account_settings_add_account_label=0x7f0600b7;
- public static final int account_settings_always_bcc_label=0x7f0600c1;
- public static final int account_settings_always_bcc_summary=0x7f0600c2;
- public static final int account_settings_composition_label=0x7f0600c0;
- public static final int account_settings_composition_title=0x7f0600bf;
- public static final int account_settings_default_label=0x7f0600ac;
- public static final int account_settings_default_summary=0x7f0600ad;
- public static final int account_settings_description_label=0x7f0600b8;
- public static final int account_settings_email_label=0x7f0600af;
- public static final int account_settings_incoming_label=0x7f0600b3;
- public static final int account_settings_incoming_summary=0x7f0600b4;
- public static final int account_settings_mail_check_frequency_label=0x7f0600b2;
- public static final int account_settings_name_label=0x7f0600b9;
- public static final int account_settings_notifications=0x7f0600ba;
- public static final int account_settings_notify_label=0x7f0600ae;
- public static final int account_settings_notify_summary=0x7f0600b0;
- public static final int account_settings_outgoing_label=0x7f0600b5;
- public static final int account_settings_outgoing_summary=0x7f0600b6;
- public static final int account_settings_ringtone=0x7f0600bd;
- public static final int account_settings_servers=0x7f0600be;
- public static final int account_settings_show_combined_label=0x7f0600b1;
- public static final int account_settings_signature_label=0x7f0600c3;
- public static final int account_settings_signature_summary=0x7f0600c4;
- public static final int account_settings_title_fmt=0x7f0600ab;
- public static final int account_settings_vibrate_enable=0x7f0600bb;
- public static final int account_settings_vibrate_summary=0x7f0600bc;
- public static final int account_setup_account_type_imap_action=0x7f060078;
- public static final int account_setup_account_type_instructions=0x7f060076;
- public static final int account_setup_account_type_pop_action=0x7f060077;
- public static final int account_setup_account_type_title=0x7f060075;
- public static final int account_setup_basics_default_label=0x7f060068;
- public static final int account_setup_basics_email_error_duplicate_fmt=0x7f060066;
- public static final int account_setup_basics_email_error_invalid_fmt=0x7f060065;
- public static final int account_setup_basics_email_hint=0x7f060064;
- public static final int account_setup_basics_instructions=0x7f060062;
- public static final int account_setup_basics_instructions2_fmt=0x7f060063;
- public static final int account_setup_basics_manual_setup_action=0x7f060069;
- public static final int account_setup_basics_password_hint=0x7f060067;
- public static final int account_setup_basics_title=0x7f060061;
- public static final int account_setup_check_settings_canceling_msg=0x7f06006f;
- public static final int account_setup_check_settings_check_incoming_msg=0x7f06006c;
- public static final int account_setup_check_settings_check_outgoing_msg=0x7f06006d;
- public static final int account_setup_check_settings_finishing_msg=0x7f06006e;
- public static final int account_setup_check_settings_retr_info_msg=0x7f06006b;
- public static final int account_setup_check_settings_title=0x7f06006a;
- public static final int account_setup_failed_dlg_auth_message_fmt=0x7f0600a7;
+ public static final int account_settings_add_account_label=0x7f0600b8;
+ public static final int account_settings_always_bcc_label=0x7f0600c2;
+ public static final int account_settings_always_bcc_summary=0x7f0600c3;
+ public static final int account_settings_composition_label=0x7f0600c1;
+ public static final int account_settings_composition_title=0x7f0600c0;
+ public static final int account_settings_default_label=0x7f0600ad;
+ public static final int account_settings_default_summary=0x7f0600ae;
+ public static final int account_settings_description_label=0x7f0600b9;
+ public static final int account_settings_email_label=0x7f0600b0;
+ public static final int account_settings_incoming_label=0x7f0600b4;
+ public static final int account_settings_incoming_summary=0x7f0600b5;
+ public static final int account_settings_mail_check_frequency_label=0x7f0600b3;
+ public static final int account_settings_name_label=0x7f0600ba;
+ public static final int account_settings_notifications=0x7f0600bb;
+ public static final int account_settings_notify_label=0x7f0600af;
+ public static final int account_settings_notify_summary=0x7f0600b1;
+ public static final int account_settings_outgoing_label=0x7f0600b6;
+ public static final int account_settings_outgoing_summary=0x7f0600b7;
+ public static final int account_settings_ringtone=0x7f0600be;
+ public static final int account_settings_servers=0x7f0600bf;
+ public static final int account_settings_show_combined_label=0x7f0600b2;
+ public static final int account_settings_signature_label=0x7f0600c4;
+ public static final int account_settings_signature_summary=0x7f0600c5;
+ public static final int account_settings_title_fmt=0x7f0600ac;
+ public static final int account_settings_vibrate_enable=0x7f0600bc;
+ public static final int account_settings_vibrate_summary=0x7f0600bd;
+ public static final int account_setup_account_type_imap_action=0x7f060079;
+ public static final int account_setup_account_type_instructions=0x7f060077;
+ public static final int account_setup_account_type_pop_action=0x7f060078;
+ public static final int account_setup_account_type_title=0x7f060076;
+ public static final int account_setup_basics_default_label=0x7f060069;
+ public static final int account_setup_basics_email_error_duplicate_fmt=0x7f060067;
+ public static final int account_setup_basics_email_error_invalid_fmt=0x7f060066;
+ public static final int account_setup_basics_email_hint=0x7f060065;
+ public static final int account_setup_basics_instructions=0x7f060063;
+ public static final int account_setup_basics_instructions2_fmt=0x7f060064;
+ public static final int account_setup_basics_manual_setup_action=0x7f06006a;
+ public static final int account_setup_basics_password_hint=0x7f060068;
+ public static final int account_setup_basics_title=0x7f060062;
+ public static final int account_setup_check_settings_canceling_msg=0x7f060070;
+ public static final int account_setup_check_settings_check_incoming_msg=0x7f06006d;
+ public static final int account_setup_check_settings_check_outgoing_msg=0x7f06006e;
+ public static final int account_setup_check_settings_finishing_msg=0x7f06006f;
+ public static final int account_setup_check_settings_retr_info_msg=0x7f06006c;
+ public static final int account_setup_check_settings_title=0x7f06006b;
+ public static final int account_setup_failed_dlg_auth_message_fmt=0x7f0600a8;
/** Username or password incorrect\n(ERR01 Account does not exist)
*/
- public static final int account_setup_failed_dlg_certificate_message_fmt=0x7f0600a8;
+ public static final int account_setup_failed_dlg_certificate_message_fmt=0x7f0600a9;
/** Cannot connect to server\n(Connection timed out)
*/
- public static final int account_setup_failed_dlg_edit_details_action=0x7f0600aa;
+ public static final int account_setup_failed_dlg_edit_details_action=0x7f0600ab;
/** Cannot safely connect to server\n(Invalid certificate)
*/
- public static final int account_setup_failed_dlg_server_message_fmt=0x7f0600a9;
- public static final int account_setup_failed_dlg_title=0x7f0600a6;
- public static final int account_setup_finished_toast=0x7f060074;
- public static final int account_setup_incoming_delete_policy_7days_label=0x7f060087;
- public static final int account_setup_incoming_delete_policy_delete_label=0x7f060088;
- public static final int account_setup_incoming_delete_policy_label=0x7f060085;
- public static final int account_setup_incoming_delete_policy_never_label=0x7f060086;
- public static final int account_setup_incoming_imap_path_prefix_hint=0x7f06008a;
- public static final int account_setup_incoming_imap_path_prefix_label=0x7f060089;
- public static final int account_setup_incoming_imap_server_label=0x7f06007d;
- public static final int account_setup_incoming_password_label=0x7f06007b;
- public static final int account_setup_incoming_pop_server_label=0x7f06007c;
- public static final int account_setup_incoming_port_label=0x7f06007e;
- public static final int account_setup_incoming_security_label=0x7f06007f;
- public static final int account_setup_incoming_security_none_label=0x7f060080;
- public static final int account_setup_incoming_security_ssl_label=0x7f060082;
- public static final int account_setup_incoming_security_ssl_optional_label=0x7f060081;
- public static final int account_setup_incoming_security_tls_label=0x7f060084;
- public static final int account_setup_incoming_security_tls_optional_label=0x7f060083;
- public static final int account_setup_incoming_title=0x7f060079;
- public static final int account_setup_incoming_username_label=0x7f06007a;
- public static final int account_setup_names_account_name_label=0x7f060072;
- public static final int account_setup_names_instructions=0x7f060071;
- public static final int account_setup_names_title=0x7f060070;
- public static final int account_setup_names_user_name_label=0x7f060073;
- public static final int account_setup_options_default_label=0x7f0600a4;
- public static final int account_setup_options_mail_check_frequency_10min=0x7f0600a0;
- public static final int account_setup_options_mail_check_frequency_15min=0x7f0600a1;
- public static final int account_setup_options_mail_check_frequency_1hour=0x7f0600a3;
- public static final int account_setup_options_mail_check_frequency_30min=0x7f0600a2;
- public static final int account_setup_options_mail_check_frequency_5min=0x7f06009f;
- public static final int account_setup_options_mail_check_frequency_label=0x7f06009d;
+ public static final int account_setup_failed_dlg_server_message_fmt=0x7f0600aa;
+ public static final int account_setup_failed_dlg_title=0x7f0600a7;
+ public static final int account_setup_finished_toast=0x7f060075;
+ public static final int account_setup_incoming_delete_policy_7days_label=0x7f060088;
+ public static final int account_setup_incoming_delete_policy_delete_label=0x7f060089;
+ public static final int account_setup_incoming_delete_policy_label=0x7f060086;
+ public static final int account_setup_incoming_delete_policy_never_label=0x7f060087;
+ public static final int account_setup_incoming_imap_path_prefix_hint=0x7f06008b;
+ public static final int account_setup_incoming_imap_path_prefix_label=0x7f06008a;
+ public static final int account_setup_incoming_imap_server_label=0x7f06007e;
+ public static final int account_setup_incoming_password_label=0x7f06007c;
+ public static final int account_setup_incoming_pop_server_label=0x7f06007d;
+ public static final int account_setup_incoming_port_label=0x7f06007f;
+ public static final int account_setup_incoming_security_label=0x7f060080;
+ public static final int account_setup_incoming_security_none_label=0x7f060081;
+ public static final int account_setup_incoming_security_ssl_label=0x7f060083;
+ public static final int account_setup_incoming_security_ssl_optional_label=0x7f060082;
+ public static final int account_setup_incoming_security_tls_label=0x7f060085;
+ public static final int account_setup_incoming_security_tls_optional_label=0x7f060084;
+ public static final int account_setup_incoming_title=0x7f06007a;
+ public static final int account_setup_incoming_username_label=0x7f06007b;
+ public static final int account_setup_names_account_name_label=0x7f060073;
+ public static final int account_setup_names_instructions=0x7f060072;
+ public static final int account_setup_names_title=0x7f060071;
+ public static final int account_setup_names_user_name_label=0x7f060074;
+ public static final int account_setup_options_default_label=0x7f0600a5;
+ public static final int account_setup_options_mail_check_frequency_10min=0x7f0600a1;
+ public static final int account_setup_options_mail_check_frequency_15min=0x7f0600a2;
+ public static final int account_setup_options_mail_check_frequency_1hour=0x7f0600a4;
+ public static final int account_setup_options_mail_check_frequency_30min=0x7f0600a3;
+ public static final int account_setup_options_mail_check_frequency_5min=0x7f0600a0;
+ public static final int account_setup_options_mail_check_frequency_label=0x7f06009e;
/** Frequency also used in account_settings_*
*/
- public static final int account_setup_options_mail_check_frequency_never=0x7f06009e;
- public static final int account_setup_options_notify_label=0x7f0600a5;
- public static final int account_setup_options_title=0x7f06009c;
- public static final int account_setup_outgoing_authentication_basic_label=0x7f060097;
- public static final int account_setup_outgoing_authentication_basic_password_label=0x7f060099;
- public static final int account_setup_outgoing_authentication_basic_username_label=0x7f060098;
- public static final int account_setup_outgoing_authentication_imap_before_smtp_label=0x7f06009b;
+ public static final int account_setup_options_mail_check_frequency_never=0x7f06009f;
+ public static final int account_setup_options_notify_label=0x7f0600a6;
+ public static final int account_setup_options_title=0x7f06009d;
+ public static final int account_setup_outgoing_authentication_basic_label=0x7f060098;
+ public static final int account_setup_outgoing_authentication_basic_password_label=0x7f06009a;
+ public static final int account_setup_outgoing_authentication_basic_username_label=0x7f060099;
+ public static final int account_setup_outgoing_authentication_imap_before_smtp_label=0x7f06009c;
/** The authentication strings below are for a planned (hopefully) change to the above username and password options
*/
- public static final int account_setup_outgoing_authentication_label=0x7f060096;
- public static final int account_setup_outgoing_authentication_pop_before_smtp_label=0x7f06009a;
- public static final int account_setup_outgoing_password_label=0x7f060095;
- public static final int account_setup_outgoing_port_label=0x7f06008d;
- public static final int account_setup_outgoing_require_login_label=0x7f060093;
- public static final int account_setup_outgoing_security_label=0x7f06008e;
- public static final int account_setup_outgoing_security_none_label=0x7f06008f;
- public static final int account_setup_outgoing_security_ssl_label=0x7f060090;
- public static final int account_setup_outgoing_security_tls_label=0x7f060092;
- public static final int account_setup_outgoing_security_tls_optional_label=0x7f060091;
- public static final int account_setup_outgoing_smtp_server_label=0x7f06008c;
- public static final int account_setup_outgoing_title=0x7f06008b;
- public static final int account_setup_outgoing_username_label=0x7f060094;
+ public static final int account_setup_outgoing_authentication_label=0x7f060097;
+ public static final int account_setup_outgoing_authentication_pop_before_smtp_label=0x7f06009b;
+ public static final int account_setup_outgoing_password_label=0x7f060096;
+ public static final int account_setup_outgoing_port_label=0x7f06008e;
+ public static final int account_setup_outgoing_require_login_label=0x7f060094;
+ public static final int account_setup_outgoing_security_label=0x7f06008f;
+ public static final int account_setup_outgoing_security_none_label=0x7f060090;
+ public static final int account_setup_outgoing_security_ssl_label=0x7f060091;
+ public static final int account_setup_outgoing_security_tls_label=0x7f060093;
+ public static final int account_setup_outgoing_security_tls_optional_label=0x7f060092;
+ public static final int account_setup_outgoing_smtp_server_label=0x7f06008d;
+ public static final int account_setup_outgoing_title=0x7f06008c;
+ public static final int account_setup_outgoing_username_label=0x7f060095;
public static final int accounts_action=0x7f06001d;
public static final int accounts_context_menu_title=0x7f060029;
public static final int accounts_title=0x7f060004;
@@ -334,9 +334,9 @@ public final class R {
/** User to confirm acceptance of dialog boxes, warnings, errors, etc.
*/
public static final int cancel_action=0x7f060009;
- public static final int combined_inbox_label=0x7f060040;
- public static final int combined_inbox_list_title=0x7f060041;
- public static final int combined_inbox_title=0x7f06003f;
+ public static final int combined_inbox_label=0x7f060041;
+ public static final int combined_inbox_list_title=0x7f060042;
+ public static final int combined_inbox_title=0x7f060040;
public static final int compose_action=0x7f060017;
public static final int compose_title=0x7f060005;
public static final int continue_action=0x7f06000f;
@@ -353,44 +353,45 @@ public final class R {
public static final int folders_action=0x7f060022;
public static final int forward_action=0x7f06000e;
public static final int general_no_subject=0x7f06002a;
- public static final int mailbox_select_dlg_new_mailbox_action=0x7f06005a;
- public static final int mailbox_select_dlg_title=0x7f060059;
+ public static final int mailbox_select_dlg_new_mailbox_action=0x7f06005b;
+ public static final int mailbox_select_dlg_title=0x7f06005a;
public static final int mark_as_read_action=0x7f06001f;
public static final int mark_as_unread_action=0x7f060020;
- public static final int message_compose_attachments_skipped_toast=0x7f06004d;
- public static final int message_compose_bcc_hint=0x7f060046;
- public static final int message_compose_cc_hint=0x7f060045;
- public static final int message_compose_downloading_attachments_toast=0x7f06004c;
- public static final int message_compose_error_no_recipients=0x7f06004b;
- public static final int message_compose_fwd_header_fmt=0x7f060048;
- public static final int message_compose_quoted_text_label=0x7f06004a;
- public static final int message_compose_reply_header_fmt=0x7f060049;
- public static final int message_compose_subject_hint=0x7f060047;
- public static final int message_compose_to_hint=0x7f060044;
- public static final int message_copied_toast=0x7f06005c;
- public static final int message_deleted_toast=0x7f06005e;
- public static final int message_discarded_toast=0x7f06005f;
+ public static final int message_compose_attachments_skipped_toast=0x7f06004e;
+ public static final int message_compose_bcc_hint=0x7f060047;
+ public static final int message_compose_cc_hint=0x7f060046;
+ public static final int message_compose_downloading_attachments_toast=0x7f06004d;
+ public static final int message_compose_error_no_recipients=0x7f06004c;
+ public static final int message_compose_fwd_header_fmt=0x7f060049;
+ public static final int message_compose_quoted_text_label=0x7f06004b;
+ public static final int message_compose_reply_header_fmt=0x7f06004a;
+ public static final int message_compose_subject_hint=0x7f060048;
+ public static final int message_compose_to_hint=0x7f060045;
+ public static final int message_copied_toast=0x7f06005d;
+ public static final int message_deleted_toast=0x7f06005f;
+ public static final int message_discarded_toast=0x7f060060;
+ public static final int message_header_mua=0x7f06003f;
/** Inbox (12)
*/
- public static final int message_list_load_more_messages_action=0x7f060043;
+ public static final int message_list_load_more_messages_action=0x7f060044;
/** Inbox here should be the same as mailbox_name_inbox
*/
- public static final int message_list_title_fmt=0x7f060042;
- public static final int message_moved_toast=0x7f06005d;
- public static final int message_saved_toast=0x7f060060;
- public static final int message_view_attachment_download_action=0x7f060050;
- public static final int message_view_attachment_view_action=0x7f06004f;
- public static final int message_view_datetime_fmt=0x7f060053;
- public static final int message_view_fetching_attachment_toast=0x7f060058;
- public static final int message_view_next_action=0x7f060052;
- public static final int message_view_prev_action=0x7f060051;
- public static final int message_view_show_pictures_action=0x7f060057;
- public static final int message_view_show_pictures_instructions=0x7f060056;
- public static final int message_view_status_attachment_not_saved=0x7f060055;
- public static final int message_view_status_attachment_saved=0x7f060054;
- public static final int message_view_to_label=0x7f06004e;
+ public static final int message_list_title_fmt=0x7f060043;
+ public static final int message_moved_toast=0x7f06005e;
+ public static final int message_saved_toast=0x7f060061;
+ public static final int message_view_attachment_download_action=0x7f060051;
+ public static final int message_view_attachment_view_action=0x7f060050;
+ public static final int message_view_datetime_fmt=0x7f060054;
+ public static final int message_view_fetching_attachment_toast=0x7f060059;
+ public static final int message_view_next_action=0x7f060053;
+ public static final int message_view_prev_action=0x7f060052;
+ public static final int message_view_show_pictures_action=0x7f060058;
+ public static final int message_view_show_pictures_instructions=0x7f060057;
+ public static final int message_view_status_attachment_not_saved=0x7f060056;
+ public static final int message_view_status_attachment_saved=0x7f060055;
+ public static final int message_view_to_label=0x7f06004f;
public static final int move_to_action=0x7f060021;
- public static final int new_mailbox_dlg_title=0x7f06005b;
+ public static final int new_mailbox_dlg_title=0x7f06005c;
/** Actions will be used as buttons and in menu items
*/
public static final int next_action=0x7f060007;
@@ -406,8 +407,8 @@ public final class R {
public static final int okay_action=0x7f060008;
public static final int open_action=0x7f06001a;
public static final int preferences_action=0x7f060019;
- public static final int provider_note_live=0x7f0600c8;
- public static final int provider_note_yahoo=0x7f0600c7;
+ public static final int provider_note_live=0x7f0600c9;
+ public static final int provider_note_yahoo=0x7f0600c8;
public static final int read_action=0x7f06001e;
public static final int read_attachment_desc=0x7f060002;
public static final int read_attachment_label=0x7f060001;
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index d7f58ac7e..ae26a2946 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -32,7 +32,6 @@ public class AccountSettings extends PreferenceActivity {
private static final String PREFERENCE_RINGTONE = "account_ringtone";
private static final String PREFERENCE_INCOMING = "incoming";
private static final String PREFERENCE_OUTGOING = "outgoing";
- private static final String PREFERENCE_ADD_ACCOUNT = "add_account";
private Account mAccount;
@@ -140,13 +139,6 @@ public class AccountSettings extends PreferenceActivity {
return true;
}
});
- findPreference(PREFERENCE_ADD_ACCOUNT).setOnPreferenceClickListener(
- new Preference.OnPreferenceClickListener() {
- public boolean onPreferenceClick(Preference preference) {
- onAddNewAccount();
- return true;
- }
- });
}
@Override
@@ -190,8 +182,4 @@ public class AccountSettings extends PreferenceActivity {
AccountSetupOutgoing.actionEditOutgoingSettings(this, mAccount);
}
- private void onAddNewAccount() {
- AccountSetupBasics.actionNewAccount(this);
- finish();
- }
}