moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes Issue 59 (provides 2 - 24 poll check periods) 

Improves Issue 742 (makes push settings more obvious)
This commit is contained in:
Daniel Applebaum 2009-11-14 15:07:12 +00:00
parent 84a1e0647d
commit 133964fbf3
4 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/arrays.xml
View File

@ -24,6 +24,11 @@
<item>@string/account_setup_options_mail_check_frequency_15min</item>
<item>@string/account_setup_options_mail_check_frequency_30min</item>
<item>@string/account_setup_options_mail_check_frequency_1hour</item>
<item>@string/account_setup_options_mail_check_frequency_2hour</item>
<item>@string/account_setup_options_mail_check_frequency_3hour</item>
<item>@string/account_setup_options_mail_check_frequency_6hour</item>
<item>@string/account_setup_options_mail_check_frequency_12hour</item>
<item>@string/account_setup_options_mail_check_frequency_24hour</item>
</string-array>
<string-array name="account_settings_check_frequency_values">
@ -34,6 +39,11 @@
<item>15</item>
<item>30</item>
<item>60</item>
<item>120</item>
<item>180</item>
<item>360</item>
<item>720</item>
<item>1440</item>
</string-array>
<string-array name="account_settings_display_count_entries">

16
res/values/strings.xml
View File

@ -330,7 +330,7 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
<string name="compact_action">Compact</string>
<string name="clear_action">Clear all data (danger!)</string>
<string name="account_setup_options_mail_check_frequency_label">Email checking frequency</string>
<string name="account_setup_options_mail_check_frequency_label">Folder poll check frequency</string>
<!-- Frequency also used in account_settings_* -->
<string name="account_setup_options_mail_check_frequency_never">Never</string>
<string name="account_setup_options_mail_check_frequency_1min">Every minute</string>
@ -339,6 +339,12 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
<string name="account_setup_options_mail_check_frequency_15min">Every 15 minutes</string>
<string name="account_setup_options_mail_check_frequency_30min">Every 30 minutes</string>
<string name="account_setup_options_mail_check_frequency_1hour">Every hour</string>
<string name="account_setup_options_mail_check_frequency_2hour">Every 2 hours</string>
<string name="account_setup_options_mail_check_frequency_3hour">Every 3 hours</string>
<string name="account_setup_options_mail_check_frequency_6hour">Every 6 hours</string>
<string name="account_setup_options_mail_check_frequency_12hour">Every 12 hours</string>
<string name="account_setup_options_mail_check_frequency_24hour">Every 24 hours</string>
<string name="account_setup_options_default_label">Send email from this account by default</string>
<string name="account_setup_options_notify_label">Notify me when email arrives</string>
<string name="account_setup_options_notify_sync_label">Notify me while email is being checked</string>
@ -377,25 +383,25 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
<string name="account_settings_display_sync">Display and synchronization</string>
<string name="account_settings_mail_check_frequency_label">Email check frequency</string>
<string name="account_settings_mail_check_frequency_label">Folder poll check frequency</string>
<string name="account_settings_second_class_check_frequency_label">2nd class check frequency</string>
<string name="account_settings_mail_display_count_label">Number of emails to display</string>
<string name="account_settings_folder_display_mode_label">Folder display mode</string>
<string name="account_settings_folder_display_mode_label">Folders to display</string>
<string name="account_settings_folder_display_mode_all">All</string>
<string name="account_settings_folder_display_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_display_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_display_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_label">Folder sync mode</string>
<string name="account_settings_folder_sync_mode_label">Folders to check with poll</string>
<string name="account_settings_folder_sync_mode_all">All</string>
<string name="account_settings_folder_sync_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_sync_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_none">None</string>
<string name="account_settings_folder_push_mode_label">Push email check</string>
<string name="account_settings_folder_push_mode_label">Folders to check with push</string>
<string name="account_settings_folder_push_mode_all">All</string>
<string name="account_settings_folder_push_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_push_mode_first_and_second_class">1st and 2nd Class folders</string>

17
res/xml/account_settings_preferences.xml
View File

@ -62,7 +62,14 @@
android:entries="@array/account_settings_check_frequency_entries"
android:entryValues="@array/account_settings_check_frequency_values"
android:dialogTitle="@string/account_settings_mail_check_frequency_label" />
<ListPreference
android:key="folder_sync_mode"
android:title="@string/account_settings_folder_sync_mode_label"
android:entries="@array/account_settings_folder_sync_mode_entries"
android:entryValues="@array/account_settings_folder_sync_mode_values"
android:dialogTitle="@string/account_settings_folder_sync_mode_label" />
<ListPreference
android:key="folder_push_mode"
android:title="@string/account_settings_folder_push_mode_label"
@ -77,14 +84,6 @@
android:entryValues="@array/account_settings_folder_display_mode_values"
android:dialogTitle="@string/account_settings_folder_display_mode_label" />
<ListPreference
android:key="folder_sync_mode"
android:title="@string/account_settings_folder_sync_mode_label"
android:entries="@array/account_settings_folder_sync_mode_entries"
android:entryValues="@array/account_settings_folder_sync_mode_values"
android:dialogTitle="@string/account_settings_folder_sync_mode_label" />
<ListPreference
android:key="folder_target_mode"
android:title="@string/account_settings_folder_target_mode_label"

13
src/com/android/email/activity/setup/AccountSetupOptions.java
View File

@ -67,7 +67,18 @@ public class AccountSetupOptions extends K9Activity implements OnClickListener {
getString(R.string.account_setup_options_mail_check_frequency_30min)),
new SpinnerOption(60,
getString(R.string.account_setup_options_mail_check_frequency_1hour)),
};
new SpinnerOption(120,
getString(R.string.account_setup_options_mail_check_frequency_2hour)),
new SpinnerOption(180,
getString(R.string.account_setup_options_mail_check_frequency_3hour)),
new SpinnerOption(360,
getString(R.string.account_setup_options_mail_check_frequency_6hour)),
new SpinnerOption(720,
getString(R.string.account_setup_options_mail_check_frequency_12hour)),
new SpinnerOption(1440,
getString(R.string.account_setup_options_mail_check_frequency_24hour)),
};
ArrayAdapter<SpinnerOption> checkFrequenciesAdapter = new ArrayAdapter<SpinnerOption>(this,
android.R.layout.simple_spinner_item, checkFrequencies);