mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-27 11:42:16 -05:00
Removed "Manage back button" setting
This commit is contained in:
cketti
parent
8d928d20fa
commit
20a608e1a0
@ -881,9 +881,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Vista del missatge</string>
|
||||
<string name="volume_navigation_list">Vista de diverses de llistes</string>
|
||||
|
||||
<string name="manage_back_title">Gestiona botó d’\"Enrere\"</string>
|
||||
<string name="manage_back_summary">Fes que \"Enrere\" faci anar un nivell amunt</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Comença bústia unificada</string>
|
||||
<string name="start_integrated_inbox_summary">Mostra la bústia unificada després de començar</string>
|
||||
|
||||
|
||||
@ -886,9 +886,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Zobrazení zpráv</string>
|
||||
<string name="volume_navigation_list">Různá zobrazení seznamů</string>
|
||||
|
||||
<string name="manage_back_title">Ovládání tlačítka \"Zpět\"</string>
|
||||
<string name="manage_back_summary">Tlačítkem \"Zpět\" jít vždy o úroveň výše</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Začít v Integrovaná doručené poště</string>
|
||||
<string name="start_integrated_inbox_summary">Po startu zobrazit Integrovanou doručenou poštu</string>
|
||||
|
||||
|
||||
@ -881,9 +881,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Mail-visning</string>
|
||||
<string name="volume_navigation_list">Diverse listevisninger</string>
|
||||
|
||||
<string name="manage_back_title">Håndter \"Tilbageknap\"</string>
|
||||
<string name="manage_back_summary">\"Tilbageknap\" går altid et niveau op</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Start i fælles indbakke</string>
|
||||
<string name="start_integrated_inbox_summary">Vis indhold af fælles indbakke ved opstart</string>
|
||||
|
||||
|
||||
@ -880,9 +880,6 @@ http://k9mail.googlecode.com/.
|
||||
<string name="volume_navigation_message">Nachrichtenansicht</string>
|
||||
<string name="volume_navigation_list">Diverse Listenansichten</string>
|
||||
|
||||
<string name="manage_back_title">\"Zurück\"-Taste</string>
|
||||
<string name="manage_back_summary">Die \"Zurück\"-Taste bringt Sie eine Ebene nach oben</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Gemeinsamer Posteingang bei Start</string>
|
||||
<string name="start_integrated_inbox_summary">Zeige gemeinsamen Posteingang beim Programmstart</string>
|
||||
|
||||
|
||||
@ -878,9 +878,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Προβολή μηνύματος</string>
|
||||
<string name="volume_navigation_list">Διάφορες προβολές λίστας</string>
|
||||
|
||||
<string name="manage_back_title">Λειτουργία πλήκτρου \'Πίσω\'</string>
|
||||
<string name="manage_back_summary">Το πλήκτρο \'Πίσω\' να ανεβαίνει ένα επίπεδο πάνω</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Εκκίνηση στα ενιαία εισερχόμενα</string>
|
||||
<string name="start_integrated_inbox_summary">Προβολή των \'Ενιαίων Εισερχόμενων\' κατά την εκκίνηση</string>
|
||||
|
||||
|
||||
@ -878,9 +878,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Vista de mensaje</string>
|
||||
<string name="volume_navigation_list">Listas de mensajes</string>
|
||||
|
||||
<string name="manage_back_title">Controlar botón \"Atras\" </string>
|
||||
<string name="manage_back_summary">Ir \"Atras\" hacia un nivel superior</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Usar Bandeja Unificada</string>
|
||||
<string name="start_integrated_inbox_summary">Mostrar una Bandeja de Entrada unificada al inicio</string>
|
||||
|
||||
|
||||
@ -884,9 +884,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Viestinäkymä</string>
|
||||
<string name="volume_navigation_list">Erilaisia listanäkymiä</string>
|
||||
|
||||
<string name="manage_back_title">Määritä Takaisin-painike</string>
|
||||
<string name="manage_back_summary">Pakota Takaisin-painike siirtämään aina ylemmälle tasolle</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Aloita yhdistetystä Saapuneet-kansiosta</string>
|
||||
<string name="start_integrated_inbox_summary">Näytä Yhdistetty Saapuneet-kansio ohjelman käynnistyksen jälkeen</string>
|
||||
|
||||
|
||||
@ -904,9 +904,6 @@ de plus</string>
|
||||
<string name="volume_navigation_message">Visualisation d\'un message</string>
|
||||
<string name="volume_navigation_list">Différents écrans à liste</string>
|
||||
|
||||
<string name="manage_back_title">Gérer la touche «\u00A0Retour\u00A0»</string>
|
||||
<string name="manage_back_summary">La touche «\u00A0Retour\u00A0» remonte toujours un niveau</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Boîte de messagerie unifiée au démarrage</string>
|
||||
<string name="start_integrated_inbox_summary">Afficher la boîte de messagerie unifiée au démarrage</string>
|
||||
|
||||
|
||||
@ -878,9 +878,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Vista de mensaxe</string>
|
||||
<string name="volume_navigation_list">Listas de mensaxes</string>
|
||||
|
||||
<string name="manage_back_title">Controlar botón \"Atras\" </string>
|
||||
<string name="manage_back_summary">Facer \"Atras\" sempre un nivel superior</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Iniciar na Bandexa unificada</string>
|
||||
<string name="start_integrated_inbox_summary">Amosar a Bandexa de Entrada unificada ao inicio</string>
|
||||
|
||||
|
||||
@ -875,9 +875,6 @@
|
||||
<string name="volume_navigation_message">Leveleknél</string>
|
||||
<string name="volume_navigation_list">Lista nézetek váltása</string>
|
||||
|
||||
<string name="manage_back_title">A \"Vissza\" gomb működése</string>
|
||||
<string name="manage_back_summary">Használva lépjen vissza egy szintet</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Kezdőlap az Összevont mappa</string>
|
||||
<string name="start_integrated_inbox_summary">Összes beérkezett levél mappa jelenjen meg indításkor</string>
|
||||
|
||||
|
||||
@ -882,9 +882,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Visualizzazione messaggi</string>
|
||||
<string name="volume_navigation_list">Diverse visualizzazioni di elenco</string>
|
||||
|
||||
<string name="manage_back_title">Gestisci pulsante \"Indietro\"</string>
|
||||
<string name="manage_back_summary">\"Indietro\" sale sempre di un livello</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Avvia in Posta in arrivo unificata</string>
|
||||
<string name="start_integrated_inbox_summary">Visualizza la Posta in arrivo unificata dopo l\'avvio</string>
|
||||
|
||||
|
||||
@ -893,9 +893,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">הצגת הודעה</string>
|
||||
<string name="volume_navigation_list">רשימת תצוגות שונות</string>
|
||||
|
||||
<string name="manage_back_title">נהל כפתור \'חזור\'</string>
|
||||
<string name="manage_back_summary">הגדר שכפתור \"חזור\" תמיד יחזור דף אחד</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">התחל בתיבת דואר נכנס אחידה</string>
|
||||
<string name="start_integrated_inbox_summary">הצג את תיבת הדואר הנכנס האחידה בהפעלה</string>
|
||||
|
||||
|
||||
@ -875,9 +875,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
|
||||
<string name="volume_navigation_message">メッセージ表示</string>
|
||||
<string name="volume_navigation_list">各種一覧表示</string>
|
||||
|
||||
<string name="manage_back_title">\"戻る\" ボタンの制御</string>
|
||||
<string name="manage_back_summary">\"戻る\" ボタンで常に一つ前に戻る</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">統合フォルダで始める</string>
|
||||
<string name="start_integrated_inbox_summary">起動後に統合フォルダを表示する</string>
|
||||
|
||||
|
||||
@ -878,9 +878,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
|
||||
<string name="volume_navigation_message">메시지 뷰</string>
|
||||
<string name="volume_navigation_list">다양한 리스트 뷰</string>
|
||||
|
||||
<string name="manage_back_title"> \"뒤로\" 버튼 관리</string>
|
||||
<string name="manage_back_summary">\"뒤로\" 버튼이 항상 위로</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">통합 편지함으로 시작</string>
|
||||
<string name="start_integrated_inbox_summary">통합 편지함을 시작시 보여줍니다</string>
|
||||
|
||||
|
||||
@ -877,9 +877,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Bericht beeld</string>
|
||||
<string name="volume_navigation_list">Variabele lijst beelden</string>
|
||||
|
||||
<string name="manage_back_title">Beheer \"Terug\" knop</string>
|
||||
<string name="manage_back_summary">Laat \"Terug\" altijd 1 niveau omhoog gaan</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Geïntegreerde Inbox bij start</string>
|
||||
<string name="start_integrated_inbox_summary">Laat de geïntegreerde Inbox zien na opstarten</string>
|
||||
|
||||
|
||||
@ -910,9 +910,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Wygląd wiadomości</string>
|
||||
<string name="volume_navigation_list">Różne widoki list</string>
|
||||
|
||||
<string name="manage_back_title">Przycisk \"Cofnij\"</string>
|
||||
<string name="manage_back_summary">Przycisk \"Cofnij\" zawsze cofa o jeden poziom wyżej</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Pokaż zintegrowaną</string>
|
||||
<string name="start_integrated_inbox_summary">Wyświetl \"Zintegrowana odbiorcza\" po uruchomieniu programu</string>
|
||||
|
||||
|
||||
@ -877,9 +877,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Visualizar mensagem</string>
|
||||
<string name="volume_navigation_list">Vários modos de exibição da lista</string>
|
||||
|
||||
<string name="manage_back_title">Gerenciar botão \"Voltar\"</string>
|
||||
<string name="manage_back_summary">Tormar \"Voltar\" padrão para subir um nível</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Iniciar com Caixas de Entrada Unificadas</string>
|
||||
<string name="start_integrated_inbox_summary">Mostra Caixas Unificadas ao abrir o K-9 Mail</string>
|
||||
|
||||
|
||||
@ -874,9 +874,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Сообщение</string>
|
||||
<string name="volume_navigation_list">Различные списки элементов</string>
|
||||
|
||||
<string name="manage_back_title">Использовать кнопку \"Назад\"</string>
|
||||
<string name="manage_back_summary">\"Назад\" всегда возвращает на уровень вверх</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Входить в общий ящик при запуске</string>
|
||||
<string name="start_integrated_inbox_summary">Показать общий ящик сообщений после запуска</string>
|
||||
|
||||
|
||||
@ -881,9 +881,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">E-post-vy</string>
|
||||
<string name="volume_navigation_list">Diverse listvyer</string>
|
||||
|
||||
<string name="manage_back_title">Hantera \"Tillbaka\"-knappen</string>
|
||||
<string name="manage_back_summary">\"Tillbaka\"-knappen går alltid upp en nivå</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Integrerad inkorg vid start</string>
|
||||
<string name="start_integrated_inbox_summary">Visa den integrerade inkorgen vid start</string>
|
||||
|
||||
|
||||
@ -881,9 +881,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
|
||||
<string name="volume_navigation_message">Mesaj görünümü</string>
|
||||
<string name="volume_navigation_list">Çeşitli liste görünümleri</string>
|
||||
|
||||
<string name="manage_back_title">\"Geri\" düğmesini yönet</string>
|
||||
<string name="manage_back_summary">\"Geri\" düğmesi daima bir üst seviyeye çıkartır</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Birleşik Gelen Kutusu ile başla</string>
|
||||
<string name="start_integrated_inbox_summary">Başlangıçta Birleşik Gelen Kutusunu göster</string>
|
||||
|
||||
|
||||
@ -880,9 +880,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Перегляд повідомлень</string>
|
||||
<string name="volume_navigation_list">Різноманітні списки елементів</string>
|
||||
|
||||
<string name="manage_back_title">Управління кнопкою „Назад“</string>
|
||||
<string name="manage_back_summary">„Назад“ завжди повертає на рівень вгору</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">При запуску відкривати спільну папку „Вхідні“</string>
|
||||
<string name="start_integrated_inbox_summary">Показати спільну папку „Вхідні“ після запуску</string>
|
||||
|
||||
|
||||
@ -869,9 +869,6 @@
|
||||
<string name="volume_navigation_message">信息视图</string>
|
||||
<string name="volume_navigation_list">不同的列表视图</string>
|
||||
|
||||
<string name="manage_back_title">管理“返回”按钮</string>
|
||||
<string name="manage_back_summary">每次点击“返回”按钮时都向上返回一个层次</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">从全局收件箱启动</string>
|
||||
<string name="start_integrated_inbox_summary">启动后显示全局收件箱</string>
|
||||
|
||||
|
||||
@ -887,9 +887,6 @@
|
||||
<string name="volume_navigation_message">訊息檢視</string>
|
||||
<string name="volume_navigation_list">不同的訊息檢視列表</string>
|
||||
|
||||
<string name="manage_back_title">管理「返回」按鈕</string>
|
||||
<string name="manage_back_summary">每次點擊「返回」按鈕時返回上一個頁面</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">從全域收件匣啟動</string>
|
||||
<string name="start_integrated_inbox_summary">啟動後顯示全域收件匣</string>
|
||||
|
||||
|
||||
@ -892,9 +892,6 @@ http://k9mail.googlecode.com/
|
||||
<string name="volume_navigation_message">Message view</string>
|
||||
<string name="volume_navigation_list">Various list views</string>
|
||||
|
||||
<string name="manage_back_title">Manage \"Back\" button</string>
|
||||
<string name="manage_back_summary">Make \"Back\" always go up a level</string>
|
||||
|
||||
<string name="start_integrated_inbox_title">Start in Unified Inbox</string>
|
||||
<string name="start_integrated_inbox_summary">Show the Unified Inbox after startup</string>
|
||||
|
||||
|
||||
@ -203,12 +203,6 @@
|
||||
android:positiveButtonText="@android:string/ok"
|
||||
android:negativeButtonText="@android:string/cancel" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:persistent="false"
|
||||
android:key="manage_back"
|
||||
android:title="@string/manage_back_title"
|
||||
android:summary="@string/manage_back_summary" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:persistent="false"
|
||||
android:key="messageview_return_to_list"
|
||||
|
||||
@ -182,7 +182,6 @@ public class K9 extends Application {
|
||||
private static boolean mGesturesEnabled = true;
|
||||
private static boolean mUseVolumeKeysForNavigation = false;
|
||||
private static boolean mUseVolumeKeysForListNavigation = false;
|
||||
private static boolean mManageBack = false;
|
||||
private static boolean mStartIntegratedInbox = false;
|
||||
private static boolean mMeasureAccounts = true;
|
||||
private static boolean mCountSearchMessages = true;
|
||||
@ -430,7 +429,6 @@ public class K9 extends Application {
|
||||
editor.putBoolean("gesturesEnabled", mGesturesEnabled);
|
||||
editor.putBoolean("useVolumeKeysForNavigation", mUseVolumeKeysForNavigation);
|
||||
editor.putBoolean("useVolumeKeysForListNavigation", mUseVolumeKeysForListNavigation);
|
||||
editor.putBoolean("manageBack", mManageBack);
|
||||
editor.putBoolean("mobileOptimizedLayout", mMobileOptimizedLayout);
|
||||
editor.putBoolean("quietTimeEnabled", mQuietTimeEnabled);
|
||||
editor.putString("quietTimeStarts", mQuietTimeStarts);
|
||||
@ -588,7 +586,6 @@ public class K9 extends Application {
|
||||
mGesturesEnabled = sprefs.getBoolean("gesturesEnabled", false);
|
||||
mUseVolumeKeysForNavigation = sprefs.getBoolean("useVolumeKeysForNavigation", false);
|
||||
mUseVolumeKeysForListNavigation = sprefs.getBoolean("useVolumeKeysForListNavigation", false);
|
||||
mManageBack = sprefs.getBoolean("manageBack", false);
|
||||
mStartIntegratedInbox = sprefs.getBoolean("startIntegratedInbox", false);
|
||||
mMeasureAccounts = sprefs.getBoolean("measureAccounts", true);
|
||||
mCountSearchMessages = sprefs.getBoolean("countSearchMessages", true);
|
||||
@ -779,14 +776,6 @@ public class K9 extends Application {
|
||||
mUseVolumeKeysForListNavigation = enabled;
|
||||
}
|
||||
|
||||
public static boolean manageBack() {
|
||||
return mManageBack;
|
||||
}
|
||||
|
||||
public static void setManageBack(boolean manageBack) {
|
||||
mManageBack = manageBack;
|
||||
}
|
||||
|
||||
public static boolean mobileOptimizedLayout() {
|
||||
return mMobileOptimizedLayout;
|
||||
}
|
||||
|
||||
@ -24,7 +24,6 @@ import com.fsck.k9.K9;
|
||||
import com.fsck.k9.K9.NotificationHideSubject;
|
||||
import com.fsck.k9.Preferences;
|
||||
import com.fsck.k9.R;
|
||||
import com.fsck.k9.activity.Accounts;
|
||||
import com.fsck.k9.activity.ColorPickerDialog;
|
||||
import com.fsck.k9.activity.K9PreferenceActivity;
|
||||
import com.fsck.k9.helper.DateFormatter;
|
||||
@ -54,7 +53,6 @@ public class Prefs extends K9PreferenceActivity {
|
||||
private static final String PREFERENCE_ANIMATIONS = "animations";
|
||||
private static final String PREFERENCE_GESTURES = "gestures";
|
||||
private static final String PREFERENCE_VOLUME_NAVIGATION = "volumeNavigation";
|
||||
private static final String PREFERENCE_MANAGE_BACK = "manage_back";
|
||||
private static final String PREFERENCE_START_INTEGRATED_INBOX = "start_integrated_inbox";
|
||||
private static final String PREFERENCE_CONFIRM_ACTIONS = "confirm_actions";
|
||||
private static final String PREFERENCE_NOTIFICATION_HIDE_SUBJECT = "notification_hide_subject";
|
||||
@ -97,7 +95,6 @@ public class Prefs extends K9PreferenceActivity {
|
||||
private CheckBoxPreference mAnimations;
|
||||
private CheckBoxPreference mGestures;
|
||||
private CheckBoxListPreference mVolumeNavigation;
|
||||
private CheckBoxPreference mManageBack;
|
||||
private CheckBoxPreference mStartIntegratedInbox;
|
||||
private CheckBoxListPreference mConfirmActions;
|
||||
private ListPreference mNotificationHideSubject;
|
||||
@ -193,9 +190,6 @@ public class Prefs extends K9PreferenceActivity {
|
||||
mVolumeNavigation.setItems(new CharSequence[] {getString(R.string.volume_navigation_message), getString(R.string.volume_navigation_list)});
|
||||
mVolumeNavigation.setCheckedItems(new boolean[] {K9.useVolumeKeysForNavigationEnabled(), K9.useVolumeKeysForListNavigationEnabled()});
|
||||
|
||||
mManageBack = (CheckBoxPreference)findPreference(PREFERENCE_MANAGE_BACK);
|
||||
mManageBack.setChecked(K9.manageBack());
|
||||
|
||||
mStartIntegratedInbox = (CheckBoxPreference)findPreference(PREFERENCE_START_INTEGRATED_INBOX);
|
||||
mStartIntegratedInbox.setChecked(K9.startIntegratedInbox());
|
||||
|
||||
@ -412,7 +406,6 @@ public class Prefs extends K9PreferenceActivity {
|
||||
K9.setCompactLayouts(compactLayouts.isChecked());
|
||||
K9.setUseVolumeKeysForNavigation(mVolumeNavigation.getCheckedItems()[0]);
|
||||
K9.setUseVolumeKeysForListNavigation(mVolumeNavigation.getCheckedItems()[1]);
|
||||
K9.setManageBack(mManageBack.isChecked());
|
||||
K9.setStartIntegratedInbox(!mHideSpecialAccounts.isChecked() && mStartIntegratedInbox.isChecked());
|
||||
K9.setConfirmDelete(mConfirmActions.getCheckedItems()[0]);
|
||||
K9.setConfirmDeleteStarred(mConfirmActions.getCheckedItems()[1]);
|
||||
@ -471,16 +464,6 @@ public class Prefs extends K9PreferenceActivity {
|
||||
super.onPause();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBackPressed() {
|
||||
if (K9.manageBack()) {
|
||||
Accounts.listAccounts(this);
|
||||
finish();
|
||||
} else {
|
||||
super.onBackPressed();
|
||||
}
|
||||
}
|
||||
|
||||
private void onFontSizeSettings() {
|
||||
FontSizeSettings.actionEditSettings(this);
|
||||
}
|
||||
|
||||
@ -140,9 +140,6 @@ public class GlobalSettings {
|
||||
s.put("language", Settings.versions(
|
||||
new V(1, new LanguageSetting())
|
||||
));
|
||||
s.put("manageBack", Settings.versions(
|
||||
new V(1, new BooleanSetting(false))
|
||||
));
|
||||
s.put("measureAccounts", Settings.versions(
|
||||
new V(1, new BooleanSetting(true))
|
||||
));
|
||||
|
||||
@ -35,7 +35,7 @@ public class Settings {
|
||||
*
|
||||
* @see SettingsExporter
|
||||
*/
|
||||
public static final int VERSION = 14;
|
||||
public static final int VERSION = 15;
|
||||
|
||||
public static Map<String, Object> validate(int version, Map<String,
|
||||
TreeMap<Integer, SettingsDescription>> settings,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user