From 2e454f0af708555311432f37d6910e1d528695e1 Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 15 Aug 2012 00:21:22 +0200 Subject: [PATCH] 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. --- res/values-ca/strings.xml | 2 -- res/values-cs/strings.xml | 2 -- res/values-da/strings.xml | 2 -- res/values-de/strings.xml | 2 -- res/values-el/strings.xml | 2 -- res/values-es/strings.xml | 2 -- res/values-fi/strings.xml | 2 -- res/values-fr/strings.xml | 2 -- res/values-gl/strings.xml | 2 -- res/values-hu/strings.xml | 2 -- res/values-it/strings.xml | 2 -- res/values-iw/strings.xml | 2 -- res/values-ja/strings.xml | 2 -- res/values-ko/strings.xml | 2 -- res/values-nl/strings.xml | 2 -- res/values-pl/strings.xml | 2 -- res/values-pt-rBR/strings.xml | 2 -- res/values-ru/strings.xml | 2 -- res/values-sv/strings.xml | 2 -- res/values-tr/strings.xml | 2 -- res/values-uk/strings.xml | 2 -- res/values-zh-rCN/strings.xml | 2 -- res/values-zh-rTW/strings.xml | 2 -- res/values/strings.xml | 2 -- res/xml/global_preferences.xml | 6 ---- src/com/fsck/k9/K9.java | 12 -------- src/com/fsck/k9/activity/setup/Prefs.java | 6 ---- .../fsck/k9/preferences/GlobalSettings.java | 4 --- src/com/fsck/k9/preferences/Settings.java | 2 +- src/com/fsck/k9/view/MessageWebView.java | 28 +++++++++++++++---- 30 files changed, 23 insertions(+), 83 deletions(-) diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 83048e203..faf190555 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -825,8 +825,6 @@ http://k9mail.googlecode.com/ Disposició sola columna Reformata missatges HTML missatges per a pantalles petites - Controls zoom sistema - Habilita ginys de zoom or pica sobre el zoom si el teu aparell ho permet Per defecte del sistema diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 6a079c649..09e504c08 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -830,8 +830,6 @@ http://k9mail.googlecode.com/ Jednosloupcové uspořádání Přeformátovat HTML zprávy pro menší obrazovky - Systémové ovládání zvětšování - Povolit zvětšovací doplňky nebo zvětšování štípnutím, pokud to zařízení podporuje Systémový výchozí diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 95f91ba9f..4194ed707 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -825,8 +825,6 @@ http://k9mail.googlecode.com/ Enkelkolonne layout Reformater HTML meddelelser til visning på små skærme - Zoom kontrol - Aktiver zoom widgets eller pinch-zoom hvis din enhed understøtter dette System standard diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index b44c3db1f..ff96c92e8 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -824,8 +824,6 @@ http://k9mail.googlecode.com/. Einfaches Layout HTML-Nachrichten werden für kleine Displays optimiert - System Zoom - Aktiviere Zoom-Widgets oder 2-Finger-Zoom, wenn vom Gerät unterstützt Systemvorgabe diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index e6d9f3a56..a67d21580 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -822,8 +822,6 @@ http://k9mail.googlecode.com/ Μονόστηλη διάταξη Μηνύματα HTML για μικρότερες οθόνες - Έλεγχος μεγέθυνσης - Χειριστήρια μεγέθυνσης Εξ ορισμού του συστήματος diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 28e270011..40ce8dab3 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -822,8 +822,6 @@ http://k9mail.googlecode.com/ Única Columna Ajusta mensajes HTML para pantallas pequeñas - Controles del Zoom por sistema - Permitir opciones de zoom que soporta el propio dispositivo Configurado en el sistema diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 3675daa95..738cf3763 100755 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -828,8 +828,6 @@ http://k9mail.googlecode.com/ Yhden sarakkeen asettelu Uudelleenmuotoile HTML-viestit pienemälle näytölle - Järjestelmän zoomaussäätimet - Ota käyttöön vimpaimen zoomaus tai zoomaus nipistämällä, jos laite tukee Järjestelmän oletus diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index f34666257..31894e45f 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -848,8 +848,6 @@ de plus Disposition colonne unique Réarranger les messages HTML pour les petits écrans - Zoom système - Activer les widgets zoom ou le pincer-zoomer si supporté par le système Langue du système diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index cb892564c..9c23953d3 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -822,8 +822,6 @@ http://k9mail.googlecode.com/ Columna única Reformatea mensaxes HTML para pantallas pequenas - Controles do Zoom por sistema - Permitir opcións de zoom que soporta o propio dispositivo Configurado no sistema diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 2b16b3170..82669299f 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -819,8 +819,6 @@ Egy oszlopos elrendezés HTML üzenetek újraformázása a kisebb kijelzőkhöz. - Rendszer nagyító használta - Engedélyezi a multi touch nagyítást és a nagyító widgeteket. Alapértelmezett diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 858132dd4..fa1177da1 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -826,8 +826,6 @@ http://k9mail.googlecode.com/ Layout a colonna singola Riformatta i messaggi HTML per schermi più piccoli - Zoom di sistema - Abilita widgets dello zoom o pinch-zoom se il dispositivo lo supporta Impostazioni predefinite di sistema diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 6fce7846d..58224c028 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -837,8 +837,6 @@ http://k9mail.googlecode.com/ פריסת עמודה יחידה אתחל הודעות HTML ותתאים אותם למסכים קטנים. - בקרת זום מערכת - אפשר ווידג\'טי זום או זום על ידי צביטה אם המכשיר שלך תומך בזה ברירות מחדל מערכת diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 8ca85aba6..eb915486c 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -819,8 +819,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール １列レイアウト 小さい画面用にHTMLメッセージを再構成 - ズーム制御 - デバイスが対応するならば、ズームウィジェットやピンチズームを有効にする システム設定 diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 7bf3ea9fb..1b0d4adf5 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -822,8 +822,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클 Single-column layout 작은 스크린에서 HTML 메시지를 다시만듬(reformat) - 시스템 줌 컨트롤 - Enable zoom widgets or pinch-zoom if your device supports it 시스템 기본값 diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 87dcd1139..e88a90142 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -821,8 +821,6 @@ http://k9mail.googlecode.com/ 1-kolom layout Herschik HTML berichten voor kleinere schermen - Apparaat zoom - Gebruik zoom widgets of pinch-zoom als het apparaat dat ondersteunt Volgens systeem diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 67c03d756..0c5591f84 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -854,8 +854,6 @@ http://k9mail.googlecode.com/ Ułożenie z 1 kolumną Przeformatuj wiadomości HTML dla mniejszych ekranów - Systemowe powiększenie - Użyj zoom widgets i pinch-zoom jeśli Twoje urzędzenie je obsługuje Domyślny systemowy diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index af2a2236d..7ff4362d5 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -821,8 +821,6 @@ http://k9mail.googlecode.com/ Layout de coluna única Formatar o HTML de mensagens para telas pequenas - Controle de zoom do sistema - Habilitar widgets de zoom se o telefone suportar Padrões de sistema diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index aeb02f562..0429c7340 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -818,8 +818,6 @@ http://k9mail.googlecode.com/ Режим одной колонки Форматировать HTML сообщения для маленького экрана - Системное управление зумом - Разрешить использование зума, если устройство его поддерживает По умолчанию diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index c5d47ca9f..d48444279 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -825,8 +825,6 @@ http://k9mail.googlecode.com/ En-kolumns-layout Formatera om HTML-brev för mindre skärmar - Kontroll av zoom - Aktivera zoom-widgets eller nyp-zoom om din enhet stödjer det Systemstandard diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 418b8e55b..e3588cdfe 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -826,8 +826,6 @@ http://k9mail.googlecode.com/ adresine gönderin. Tek sütun düzeni Daha küçük ekranlar için HTML mesajları yeniden biçimlendir - Sistem yakınlaştırma kontrolleri - Yakınlaştırma araçlarını veya cihazınız onu destekliyorsa pinch-zoom\'u etkinleştir Sistem Varsayılanları diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 524a72f7a..f599d23a7 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -824,8 +824,6 @@ http://k9mail.googlecode.com/ режим одного стовпця Форматування HTML повідомлення для маленького екрану - Системне управління масштабом - Включити віджети масштабування або pinch-zoom якщо пристрій їх підтримує Системна по замовчуванню diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3fee570f8..6ad4da1c1 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -813,8 +813,6 @@ 单列布局 为小屏幕重新布局HTML邮件 - 系统放大控制 - 如果设备支持则启用放大插件或多点触摸放大 系统默认值 diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 83072decb..a6f2f7c01 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -831,8 +831,6 @@ 單列佈局 針對小尺寸螢幕重新排列HTML郵件格式 - 系統放大控制 - 如果設備支援則啟用放大插件或多點觸碰放大 系統預設值 diff --git a/res/values/strings.xml b/res/values/strings.xml index 26a7e5636..e51e0e844 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -828,8 +828,6 @@ http://k9mail.googlecode.com/ Single-column layout Reformat HTML messages for smaller screens - System zoom controls - Enable zoom widgets or pinch-zoom if your device supports it System default diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml index 9c634b378..180c4f866 100644 --- a/res/xml/global_preferences.xml +++ b/res/xml/global_preferences.xml @@ -227,12 +227,6 @@ android:title="@string/global_settings_messageview_show_next_label" android:summary="@string/global_settings_messageview_show_next_summary" /> - - validate(int version, Map> settings, diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java index bb5d3d737..8869a1d89 100644 --- a/src/com/fsck/k9/view/MessageWebView.java +++ b/src/com/fsck/k9/view/MessageWebView.java @@ -2,18 +2,18 @@ package com.fsck.k9.view; import android.annotation.TargetApi; import android.content.Context; +import android.content.pm.PackageManager; import android.os.Build; import android.util.AttributeSet; import android.util.Log; import android.view.KeyEvent; -import android.view.View; import android.webkit.WebSettings; -import android.webkit.WebView; import android.widget.Toast; import com.fsck.k9.K9; import com.fsck.k9.R; import java.lang.reflect.Method; import com.nobu_games.android.view.web.TitleBarWebView; + public class MessageWebView extends TitleBarWebView { @@ -103,15 +103,16 @@ public class MessageWebView extends TitleBarWebView { final WebSettings webSettings = this.getSettings(); webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); + webSettings.setSupportZoom(true); + webSettings.setBuiltInZoomControls(true); + + disableDisplayZoomControls(); + webSettings.setJavaScriptEnabled(false); webSettings.setLoadsImagesAutomatically(true); webSettings.setRenderPriority(WebSettings.RenderPriority.HIGH); - if (K9.zoomControlsEnabled()) { - webSettings.setBuiltInZoomControls(true); - } - if (isSingleColumnLayoutSupported() && K9.mobileOptimizedLayout()) { webSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN); } 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) private void disableOverscrolling() { if (Build.VERSION.SDK_INT >= 9) {