1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-24 08:38:51 -05:00

Removed "System zoom controls" setting

We always allow zooming but hide (provided the Android version supports
it) the on-screen zoom controls if the device supports multi-touch,
hence pinch-to-zoom.
This commit is contained in:
cketti 2012-08-15 00:21:22 +02:00
parent 3f426c824c
commit 2e454f0af7
30 changed files with 23 additions and 83 deletions

View File

@ -825,8 +825,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Disposició sola columna</string> <string name="settings_messageview_mobile_layout_label">Disposició sola columna</string>
<string name="settings_messageview_mobile_layout_summary">Reformata missatges HTML missatges per a pantalles petites</string> <string name="settings_messageview_mobile_layout_summary">Reformata missatges HTML missatges per a pantalles petites</string>
<string name="settings_messageview_zoom_controls_label">Controls zoom sistema</string>
<string name="settings_messageview_zoom_controls_summary">Habilita ginys de zoom or pica sobre el zoom si el teu aparell ho permet</string>
<string name="setting_language_system">Per defecte del sistema</string> <string name="setting_language_system">Per defecte del sistema</string>

View File

@ -830,8 +830,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Jednosloupcové uspořádání</string> <string name="settings_messageview_mobile_layout_label">Jednosloupcové uspořádání</string>
<string name="settings_messageview_mobile_layout_summary">Přeformátovat HTML zprávy pro menší obrazovky</string> <string name="settings_messageview_mobile_layout_summary">Přeformátovat HTML zprávy pro menší obrazovky</string>
<string name="settings_messageview_zoom_controls_label">Systémové ovládání zvětšování</string>
<string name="settings_messageview_zoom_controls_summary">Povolit zvětšovací doplňky nebo zvětšování štípnutím, pokud to zařízení podporuje</string>
<string name="setting_language_system">Systémový výchozí</string> <string name="setting_language_system">Systémový výchozí</string>

View File

@ -825,8 +825,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Enkelkolonne layout</string> <string name="settings_messageview_mobile_layout_label">Enkelkolonne layout</string>
<string name="settings_messageview_mobile_layout_summary">Reformater HTML meddelelser til visning på små skærme</string> <string name="settings_messageview_mobile_layout_summary">Reformater HTML meddelelser til visning på små skærme</string>
<string name="settings_messageview_zoom_controls_label">Zoom kontrol</string>
<string name="settings_messageview_zoom_controls_summary">Aktiver zoom widgets eller pinch-zoom hvis din enhed understøtter dette</string>
<string name="setting_language_system">System standard</string> <string name="setting_language_system">System standard</string>

View File

@ -824,8 +824,6 @@ http://k9mail.googlecode.com/.
<string name="settings_messageview_mobile_layout_label">Einfaches Layout</string> <string name="settings_messageview_mobile_layout_label">Einfaches Layout</string>
<string name="settings_messageview_mobile_layout_summary">HTML-Nachrichten werden für kleine Displays optimiert</string> <string name="settings_messageview_mobile_layout_summary">HTML-Nachrichten werden für kleine Displays optimiert</string>
<string name="settings_messageview_zoom_controls_label">System Zoom</string>
<string name="settings_messageview_zoom_controls_summary">Aktiviere Zoom-Widgets oder 2-Finger-Zoom, wenn vom Gerät unterstützt</string>
<string name="setting_language_system">Systemvorgabe</string> <string name="setting_language_system">Systemvorgabe</string>

View File

@ -822,8 +822,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Μονόστηλη διάταξη</string> <string name="settings_messageview_mobile_layout_label">Μονόστηλη διάταξη</string>
<string name="settings_messageview_mobile_layout_summary">Μηνύματα HTML για μικρότερες οθόνες</string> <string name="settings_messageview_mobile_layout_summary">Μηνύματα HTML για μικρότερες οθόνες</string>
<string name="settings_messageview_zoom_controls_label">Έλεγχος μεγέθυνσης</string>
<string name="settings_messageview_zoom_controls_summary">Χειριστήρια μεγέθυνσης</string>
<string name="setting_language_system">Εξ ορισμού του συστήματος</string> <string name="setting_language_system">Εξ ορισμού του συστήματος</string>

View File

@ -822,8 +822,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Única Columna</string> <string name="settings_messageview_mobile_layout_label">Única Columna</string>
<string name="settings_messageview_mobile_layout_summary">Ajusta mensajes HTML para pantallas pequeñas</string> <string name="settings_messageview_mobile_layout_summary">Ajusta mensajes HTML para pantallas pequeñas</string>
<string name="settings_messageview_zoom_controls_label">Controles del Zoom por sistema</string>
<string name="settings_messageview_zoom_controls_summary">Permitir opciones de zoom que soporta el propio dispositivo</string>
<string name="setting_language_system">Configurado en el sistema</string> <string name="setting_language_system">Configurado en el sistema</string>

View File

@ -828,8 +828,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Yhden sarakkeen asettelu</string> <string name="settings_messageview_mobile_layout_label">Yhden sarakkeen asettelu</string>
<string name="settings_messageview_mobile_layout_summary">Uudelleenmuotoile HTML-viestit pienemälle näytölle</string> <string name="settings_messageview_mobile_layout_summary">Uudelleenmuotoile HTML-viestit pienemälle näytölle</string>
<string name="settings_messageview_zoom_controls_label">Järjestelmän zoomaussäätimet</string>
<string name="settings_messageview_zoom_controls_summary">Ota käyttöön vimpaimen zoomaus tai zoomaus nipistämällä, jos laite tukee</string>
<string name="setting_language_system">Järjestelmän oletus</string> <string name="setting_language_system">Järjestelmän oletus</string>

View File

@ -848,8 +848,6 @@ de plus</string>
<string name="settings_messageview_mobile_layout_label">Disposition colonne unique</string> <string name="settings_messageview_mobile_layout_label">Disposition colonne unique</string>
<string name="settings_messageview_mobile_layout_summary">Réarranger les messages HTML pour les petits écrans</string> <string name="settings_messageview_mobile_layout_summary">Réarranger les messages HTML pour les petits écrans</string>
<string name="settings_messageview_zoom_controls_label">Zoom système</string>
<string name="settings_messageview_zoom_controls_summary">Activer les widgets zoom ou le pincer-zoomer si supporté par le système</string>
<string name="setting_language_system">Langue du système</string> <string name="setting_language_system">Langue du système</string>

View File

@ -822,8 +822,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Columna única</string> <string name="settings_messageview_mobile_layout_label">Columna única</string>
<string name="settings_messageview_mobile_layout_summary">Reformatea mensaxes HTML para pantallas pequenas</string> <string name="settings_messageview_mobile_layout_summary">Reformatea mensaxes HTML para pantallas pequenas</string>
<string name="settings_messageview_zoom_controls_label">Controles do Zoom por sistema</string>
<string name="settings_messageview_zoom_controls_summary">Permitir opcións de zoom que soporta o propio dispositivo</string>
<string name="setting_language_system">Configurado no sistema</string> <string name="setting_language_system">Configurado no sistema</string>

View File

@ -819,8 +819,6 @@
<string name="settings_messageview_mobile_layout_label">Egy oszlopos elrendezés</string> <string name="settings_messageview_mobile_layout_label">Egy oszlopos elrendezés</string>
<string name="settings_messageview_mobile_layout_summary">HTML üzenetek újraformázása a kisebb kijelzőkhöz.</string> <string name="settings_messageview_mobile_layout_summary">HTML üzenetek újraformázása a kisebb kijelzőkhöz.</string>
<string name="settings_messageview_zoom_controls_label">Rendszer nagyító használta</string>
<string name="settings_messageview_zoom_controls_summary">Engedélyezi a multi touch nagyítást és a nagyító widgeteket.</string>
<string name="setting_language_system">Alapértelmezett</string> <string name="setting_language_system">Alapértelmezett</string>

View File

@ -826,8 +826,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Layout a colonna singola</string> <string name="settings_messageview_mobile_layout_label">Layout a colonna singola</string>
<string name="settings_messageview_mobile_layout_summary">Riformatta i messaggi HTML per schermi più piccoli</string> <string name="settings_messageview_mobile_layout_summary">Riformatta i messaggi HTML per schermi più piccoli</string>
<string name="settings_messageview_zoom_controls_label">Zoom di sistema</string>
<string name="settings_messageview_zoom_controls_summary">Abilita widgets dello zoom o pinch-zoom se il dispositivo lo supporta</string>
<string name="setting_language_system">Impostazioni predefinite di sistema</string> <string name="setting_language_system">Impostazioni predefinite di sistema</string>

View File

@ -837,8 +837,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">פריסת עמודה יחידה</string> <string name="settings_messageview_mobile_layout_label">פריסת עמודה יחידה</string>
<string name="settings_messageview_mobile_layout_summary">אתחל הודעות HTML ותתאים אותם למסכים קטנים.</string> <string name="settings_messageview_mobile_layout_summary">אתחל הודעות HTML ותתאים אותם למסכים קטנים.</string>
<string name="settings_messageview_zoom_controls_label">בקרת זום מערכת</string>
<string name="settings_messageview_zoom_controls_summary">אפשר ווידג\'טי זום או זום על ידי צביטה אם המכשיר שלך תומך בזה</string>
<string name="setting_language_system">ברירות מחדל מערכת</string> <string name="setting_language_system">ברירות מחדל מערכת</string>

View File

@ -819,8 +819,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="settings_messageview_mobile_layout_label">1列レイアウト</string> <string name="settings_messageview_mobile_layout_label">1列レイアウト</string>
<string name="settings_messageview_mobile_layout_summary">小さい画面用にHTMLメッセージを再構成</string> <string name="settings_messageview_mobile_layout_summary">小さい画面用にHTMLメッセージを再構成</string>
<string name="settings_messageview_zoom_controls_label">ズーム制御</string>
<string name="settings_messageview_zoom_controls_summary">デバイスが対応するならば、ズームウィジェットやピンチズームを有効にする</string>
<string name="setting_language_system">システム設定</string> <string name="setting_language_system">システム設定</string>

View File

@ -822,8 +822,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="settings_messageview_mobile_layout_label">Single-column layout</string> <string name="settings_messageview_mobile_layout_label">Single-column layout</string>
<string name="settings_messageview_mobile_layout_summary">작은 스크린에서 HTML 메시지를 다시만듬(reformat)</string> <string name="settings_messageview_mobile_layout_summary">작은 스크린에서 HTML 메시지를 다시만듬(reformat)</string>
<string name="settings_messageview_zoom_controls_label">시스템 줌 컨트롤</string>
<string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
<string name="setting_language_system">시스템 기본값</string> <string name="setting_language_system">시스템 기본값</string>

View File

@ -821,8 +821,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">1-kolom layout</string> <string name="settings_messageview_mobile_layout_label">1-kolom layout</string>
<string name="settings_messageview_mobile_layout_summary">Herschik HTML berichten voor kleinere schermen</string> <string name="settings_messageview_mobile_layout_summary">Herschik HTML berichten voor kleinere schermen</string>
<string name="settings_messageview_zoom_controls_label">Apparaat zoom</string>
<string name="settings_messageview_zoom_controls_summary">Gebruik zoom widgets of pinch-zoom als het apparaat dat ondersteunt</string>
<string name="setting_language_system">Volgens systeem</string> <string name="setting_language_system">Volgens systeem</string>

View File

@ -854,8 +854,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Ułożenie z 1 kolumną</string> <string name="settings_messageview_mobile_layout_label">Ułożenie z 1 kolumną</string>
<string name="settings_messageview_mobile_layout_summary">Przeformatuj wiadomości HTML dla mniejszych ekranów</string> <string name="settings_messageview_mobile_layout_summary">Przeformatuj wiadomości HTML dla mniejszych ekranów</string>
<string name="settings_messageview_zoom_controls_label">Systemowe powiększenie</string>
<string name="settings_messageview_zoom_controls_summary">Użyj zoom widgets i pinch-zoom jeśli Twoje urzędzenie je obsługuje</string> <!-- FIXME -->
<string name="setting_language_system">Domyślny systemowy</string> <string name="setting_language_system">Domyślny systemowy</string>

View File

@ -821,8 +821,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Layout de coluna única</string> <string name="settings_messageview_mobile_layout_label">Layout de coluna única</string>
<string name="settings_messageview_mobile_layout_summary">Formatar o HTML de mensagens para telas pequenas</string> <string name="settings_messageview_mobile_layout_summary">Formatar o HTML de mensagens para telas pequenas</string>
<string name="settings_messageview_zoom_controls_label">Controle de zoom do sistema</string>
<string name="settings_messageview_zoom_controls_summary">Habilitar widgets de zoom se o telefone suportar</string>
<string name="setting_language_system">Padrões de sistema</string> <string name="setting_language_system">Padrões de sistema</string>

View File

@ -818,8 +818,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Режим одной колонки</string> <string name="settings_messageview_mobile_layout_label">Режим одной колонки</string>
<string name="settings_messageview_mobile_layout_summary">Форматировать HTML сообщения для маленького экрана</string> <string name="settings_messageview_mobile_layout_summary">Форматировать HTML сообщения для маленького экрана</string>
<string name="settings_messageview_zoom_controls_label">Системное управление зумом</string>
<string name="settings_messageview_zoom_controls_summary">Разрешить использование зума, если устройство его поддерживает</string>
<string name="setting_language_system">По умолчанию</string> <string name="setting_language_system">По умолчанию</string>

View File

@ -825,8 +825,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">En-kolumns-layout</string> <string name="settings_messageview_mobile_layout_label">En-kolumns-layout</string>
<string name="settings_messageview_mobile_layout_summary">Formatera om HTML-brev för mindre skärmar</string> <string name="settings_messageview_mobile_layout_summary">Formatera om HTML-brev för mindre skärmar</string>
<string name="settings_messageview_zoom_controls_label">Kontroll av zoom</string>
<string name="settings_messageview_zoom_controls_summary">Aktivera zoom-widgets eller nyp-zoom om din enhet stödjer det</string>
<string name="setting_language_system">Systemstandard</string> <string name="setting_language_system">Systemstandard</string>

View File

@ -826,8 +826,6 @@ http://k9mail.googlecode.com/ adresine gönderin.
<string name="settings_messageview_mobile_layout_label">Tek sütun düzeni</string> <string name="settings_messageview_mobile_layout_label">Tek sütun düzeni</string>
<string name="settings_messageview_mobile_layout_summary">Daha küçük ekranlar için HTML mesajları yeniden biçimlendir</string> <string name="settings_messageview_mobile_layout_summary">Daha küçük ekranlar için HTML mesajları yeniden biçimlendir</string>
<string name="settings_messageview_zoom_controls_label">Sistem yakınlaştırma kontrolleri</string>
<string name="settings_messageview_zoom_controls_summary">Yakınlaştırma araçlarını veya cihazınız onu destekliyorsa pinch-zoom\'u etkinleştir</string>
<string name="setting_language_system">Sistem Varsayılanları</string> <string name="setting_language_system">Sistem Varsayılanları</string>

View File

@ -824,8 +824,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">режим одного стовпця</string> <string name="settings_messageview_mobile_layout_label">режим одного стовпця</string>
<string name="settings_messageview_mobile_layout_summary">Форматування HTML повідомлення для маленького екрану</string> <string name="settings_messageview_mobile_layout_summary">Форматування HTML повідомлення для маленького екрану</string>
<string name="settings_messageview_zoom_controls_label">Системне управління масштабом</string>
<string name="settings_messageview_zoom_controls_summary">Включити віджети масштабування або pinch-zoom якщо пристрій їх підтримує</string>
<string name="setting_language_system">Системна по замовчуванню</string> <string name="setting_language_system">Системна по замовчуванню</string>

View File

@ -813,8 +813,6 @@
<string name="settings_messageview_mobile_layout_label">单列布局</string> <string name="settings_messageview_mobile_layout_label">单列布局</string>
<string name="settings_messageview_mobile_layout_summary">为小屏幕重新布局HTML邮件</string> <string name="settings_messageview_mobile_layout_summary">为小屏幕重新布局HTML邮件</string>
<string name="settings_messageview_zoom_controls_label">系统放大控制</string>
<string name="settings_messageview_zoom_controls_summary">如果设备支持则启用放大插件或多点触摸放大</string>
<string name="setting_language_system">系统默认值</string> <string name="setting_language_system">系统默认值</string>

View File

@ -831,8 +831,6 @@
<string name="settings_messageview_mobile_layout_label">單列佈局</string> <string name="settings_messageview_mobile_layout_label">單列佈局</string>
<string name="settings_messageview_mobile_layout_summary">針對小尺寸螢幕重新排列HTML郵件格式</string> <string name="settings_messageview_mobile_layout_summary">針對小尺寸螢幕重新排列HTML郵件格式</string>
<string name="settings_messageview_zoom_controls_label">系統放大控制</string>
<string name="settings_messageview_zoom_controls_summary">如果設備支援則啟用放大插件或多點觸碰放大</string>
<string name="setting_language_system">系統預設值</string> <string name="setting_language_system">系統預設值</string>

View File

@ -828,8 +828,6 @@ http://k9mail.googlecode.com/
<string name="settings_messageview_mobile_layout_label">Single-column layout</string> <string name="settings_messageview_mobile_layout_label">Single-column layout</string>
<string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string> <string name="settings_messageview_mobile_layout_summary">Reformat HTML messages for smaller screens</string>
<string name="settings_messageview_zoom_controls_label">System zoom controls</string>
<string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
<string name="setting_language_system">System default</string> <string name="setting_language_system">System default</string>

View File

@ -227,12 +227,6 @@
android:title="@string/global_settings_messageview_show_next_label" android:title="@string/global_settings_messageview_show_next_label"
android:summary="@string/global_settings_messageview_show_next_summary" /> android:summary="@string/global_settings_messageview_show_next_summary" />
<CheckBoxPreference
android:persistent="false"
android:key="messageview_zoom_controls"
android:title="@string/settings_messageview_zoom_controls_label"
android:summary="@string/settings_messageview_zoom_controls_summary" />
<com.fsck.k9.preferences.CheckBoxListPreference <com.fsck.k9.preferences.CheckBoxListPreference
android:persistent="false" android:persistent="false"
android:key="confirm_actions" android:key="confirm_actions"

View File

@ -188,7 +188,6 @@ public class K9 extends Application {
private static boolean mMeasureAccounts = true; private static boolean mMeasureAccounts = true;
private static boolean mCountSearchMessages = true; private static boolean mCountSearchMessages = true;
private static boolean mHideSpecialAccounts = false; private static boolean mHideSpecialAccounts = false;
private static boolean mZoomControlsEnabled = false;
private static boolean mMobileOptimizedLayout = false; private static boolean mMobileOptimizedLayout = false;
private static boolean mQuietTimeEnabled = false; private static boolean mQuietTimeEnabled = false;
private static String mQuietTimeStarts = null; private static String mQuietTimeStarts = null;
@ -433,7 +432,6 @@ public class K9 extends Application {
editor.putBoolean("useVolumeKeysForNavigation", mUseVolumeKeysForNavigation); editor.putBoolean("useVolumeKeysForNavigation", mUseVolumeKeysForNavigation);
editor.putBoolean("useVolumeKeysForListNavigation", mUseVolumeKeysForListNavigation); editor.putBoolean("useVolumeKeysForListNavigation", mUseVolumeKeysForListNavigation);
editor.putBoolean("manageBack", mManageBack); editor.putBoolean("manageBack", mManageBack);
editor.putBoolean("zoomControlsEnabled", mZoomControlsEnabled);
editor.putBoolean("mobileOptimizedLayout", mMobileOptimizedLayout); editor.putBoolean("mobileOptimizedLayout", mMobileOptimizedLayout);
editor.putBoolean("quietTimeEnabled", mQuietTimeEnabled); editor.putBoolean("quietTimeEnabled", mQuietTimeEnabled);
editor.putString("quietTimeStarts", mQuietTimeStarts); editor.putString("quietTimeStarts", mQuietTimeStarts);
@ -601,7 +599,6 @@ public class K9 extends Application {
mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2); mMessageListPreviewLines = sprefs.getInt("messageListPreviewLines", 2);
mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false); mMobileOptimizedLayout = sprefs.getBoolean("mobileOptimizedLayout", false);
mZoomControlsEnabled = sprefs.getBoolean("zoomControlsEnabled", true);
mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false); mQuietTimeEnabled = sprefs.getBoolean("quietTimeEnabled", false);
mQuietTimeStarts = sprefs.getString("quietTimeStarts", "21:00"); mQuietTimeStarts = sprefs.getString("quietTimeStarts", "21:00");
@ -791,15 +788,6 @@ public class K9 extends Application {
mManageBack = manageBack; mManageBack = manageBack;
} }
public static boolean zoomControlsEnabled() {
return mZoomControlsEnabled;
}
public static void setZoomControlsEnabled(boolean zoomControlsEnabled) {
mZoomControlsEnabled = zoomControlsEnabled;
}
public static boolean mobileOptimizedLayout() { public static boolean mobileOptimizedLayout() {
return mMobileOptimizedLayout; return mMobileOptimizedLayout;
} }

View File

@ -73,7 +73,6 @@ public class Prefs extends K9PreferenceActivity {
private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list"; private static final String PREFERENCE_MESSAGEVIEW_RETURN_TO_LIST = "messageview_return_to_list";
private static final String PREFERENCE_MESSAGEVIEW_SHOW_NEXT = "messageview_show_next"; private static final String PREFERENCE_MESSAGEVIEW_SHOW_NEXT = "messageview_show_next";
private static final String PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED = "messageview_zoom_controls";
private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled"; private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled";
private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts"; private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts";
private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends"; private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends";
@ -116,7 +115,6 @@ public class Prefs extends K9PreferenceActivity {
private CheckBoxPreference mFixedWidth; private CheckBoxPreference mFixedWidth;
private CheckBoxPreference mReturnToList; private CheckBoxPreference mReturnToList;
private CheckBoxPreference mShowNext; private CheckBoxPreference mShowNext;
private CheckBoxPreference mZoomControlsEnabled;
private CheckBoxPreference mMobileOptimizedLayout; private CheckBoxPreference mMobileOptimizedLayout;
private ListPreference mBackgroundOps; private ListPreference mBackgroundOps;
private CheckBoxPreference mUseGalleryBugWorkaround; private CheckBoxPreference mUseGalleryBugWorkaround;
@ -277,9 +275,6 @@ public class Prefs extends K9PreferenceActivity {
mShowNext = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_SHOW_NEXT); mShowNext = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_SHOW_NEXT);
mShowNext.setChecked(K9.messageViewShowNext()); mShowNext.setChecked(K9.messageViewShowNext());
mZoomControlsEnabled = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_ZOOM_CONTROLS_ENABLED);
mZoomControlsEnabled.setChecked(K9.zoomControlsEnabled());
mMobileOptimizedLayout = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT); mMobileOptimizedLayout = (CheckBoxPreference) findPreference(PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT);
if (!MessageWebView.isSingleColumnLayoutSupported()) { if (!MessageWebView.isSingleColumnLayoutSupported()) {
mMobileOptimizedLayout.setEnabled(false); mMobileOptimizedLayout.setEnabled(false);
@ -455,7 +450,6 @@ public class Prefs extends K9PreferenceActivity {
K9.setBatchButtonsFlag(mBatchButtonsFlag.isChecked()); K9.setBatchButtonsFlag(mBatchButtonsFlag.isChecked());
K9.setBatchButtonsUnselect(mBatchButtonsUnselect.isChecked()); K9.setBatchButtonsUnselect(mBatchButtonsUnselect.isChecked());
K9.setZoomControlsEnabled(mZoomControlsEnabled.isChecked());
K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString()); K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString());
boolean needsRefresh = K9.setBackgroundOps(mBackgroundOps.getValue()); boolean needsRefresh = K9.setBackgroundOps(mBackgroundOps.getValue());
K9.setUseGalleryBugWorkaround(mUseGalleryBugWorkaround.isChecked()); K9.setUseGalleryBugWorkaround(mUseGalleryBugWorkaround.isChecked());

View File

@ -209,10 +209,6 @@ public class GlobalSettings {
s.put("useVolumeKeysForNavigation", Settings.versions( s.put("useVolumeKeysForNavigation", Settings.versions(
new V(1, new BooleanSetting(false)) new V(1, new BooleanSetting(false))
)); ));
s.put("zoomControlsEnabled", Settings.versions(
new V(1, new BooleanSetting(false)),
new V(4, new BooleanSetting(true))
));
s.put("batchButtonsMarkRead", Settings.versions( s.put("batchButtonsMarkRead", Settings.versions(
new V(8, new BooleanSetting(true)) new V(8, new BooleanSetting(true))
)); ));

View File

@ -35,7 +35,7 @@ public class Settings {
* *
* @see SettingsExporter * @see SettingsExporter
*/ */
public static final int VERSION = 13; public static final int VERSION = 14;
public static Map<String, Object> validate(int version, Map<String, public static Map<String, Object> validate(int version, Map<String,
TreeMap<Integer, SettingsDescription>> settings, TreeMap<Integer, SettingsDescription>> settings,

View File

@ -2,18 +2,18 @@ package com.fsck.k9.view;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.Toast; import android.widget.Toast;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.R; import com.fsck.k9.R;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import com.nobu_games.android.view.web.TitleBarWebView; import com.nobu_games.android.view.web.TitleBarWebView;
public class MessageWebView extends TitleBarWebView { public class MessageWebView extends TitleBarWebView {
@ -103,15 +103,16 @@ public class MessageWebView extends TitleBarWebView {
final WebSettings webSettings = this.getSettings(); final WebSettings webSettings = this.getSettings();
webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
webSettings.setSupportZoom(true); webSettings.setSupportZoom(true);
webSettings.setBuiltInZoomControls(true);
disableDisplayZoomControls();
webSettings.setJavaScriptEnabled(false); webSettings.setJavaScriptEnabled(false);
webSettings.setLoadsImagesAutomatically(true); webSettings.setLoadsImagesAutomatically(true);
webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH); webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH);
if (K9.zoomControlsEnabled()) {
webSettings.setBuiltInZoomControls(true);
}
if (isSingleColumnLayoutSupported() && K9.mobileOptimizedLayout()) { if (isSingleColumnLayoutSupported() && K9.mobileOptimizedLayout()) {
webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN); webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
} else { } else {
@ -127,6 +128,21 @@ public class MessageWebView extends TitleBarWebView {
} }
/**
* Disable on-screen zoom controls on devices that support zooming via pinch-to-zoom.
*/
@TargetApi(11)
private void disableDisplayZoomControls() {
if (Build.VERSION.SDK_INT >= 11) {
PackageManager pm = getContext().getPackageManager();
boolean supportsMultiTouch =
pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH) ||
pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT);
getSettings().setDisplayZoomControls(!supportsMultiTouch);
}
}
@TargetApi(9) @TargetApi(9)
private void disableOverscrolling() { private void disableOverscrolling() {
if (Build.VERSION.SDK_INT >= 9) { if (Build.VERSION.SDK_INT >= 9) {