From 600928560852c7b9ffffbfc91ee9fe1016465329 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 21 Oct 2011 18:31:44 -0700 Subject: Use UTF-8 for font size preview Bug: 5489018 Apparantly ASCII isn't good enough Change-Id: I9402c7c3e1ceedc26822469b652166885a40d6e3 --- .../AccessibilityPreferencesFragment.java | 23 ++++++++++++++++++++++ .../browser/preferences/FontSizePreview.java | 5 ++--- 2 files changed, 25 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java index c07c184b5..364d3378c 100644 --- a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java +++ b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java @@ -20,6 +20,7 @@ import android.content.Context; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; +import android.webkit.WebView; import com.android.browser.BrowserSettings; import com.android.browser.PreferenceKeys; @@ -31,10 +32,13 @@ public class AccessibilityPreferencesFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener { NumberFormat mFormat; + // Used to pause/resume timers, which are required for WebViewPreview + WebView mControlWebView; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + mControlWebView = new WebView(getActivity()); addPreferencesFromResource(R.xml.accessibility_preferences); BrowserSettings settings = BrowserSettings.getInstance(); mFormat = NumberFormat.getPercentInstance(); @@ -53,6 +57,25 @@ public class AccessibilityPreferencesFragment extends PreferenceFragment updateInvertedContrastSummary(e, (int) (settings.getInvertedContrast() * 100)); } + @Override + public void onResume() { + super.onResume(); + mControlWebView.resumeTimers(); + } + + @Override + public void onPause() { + super.onPause(); + mControlWebView.pauseTimers(); + } + + @Override + public void onDestroy() { + super.onDestroy(); + mControlWebView.destroy(); + mControlWebView = null; + } + void updateMinFontSummary(Preference pref, int minFontSize) { Context c = getActivity(); pref.setSummary(c.getString(R.string.pref_min_font_size_value, minFontSize)); diff --git a/src/com/android/browser/preferences/FontSizePreview.java b/src/com/android/browser/preferences/FontSizePreview.java index 7311e8020..91ecb0010 100644 --- a/src/com/android/browser/preferences/FontSizePreview.java +++ b/src/com/android/browser/preferences/FontSizePreview.java @@ -25,11 +25,10 @@ import android.webkit.WebView; import com.android.browser.BrowserSettings; import com.android.browser.R; -import com.android.browser.WebViewProperties; public class FontSizePreview extends WebViewPreview { - static final String HTML_FORMAT = "

"; + static final String HTML_FORMAT = "

"; String mHtml; @@ -62,7 +61,7 @@ public class FontSizePreview extends WebViewPreview { BrowserSettings bs = BrowserSettings.getInstance(); ws.setMinimumFontSize(bs.getMinimumFontSize()); ws.setTextZoom(bs.getTextZoom()); - mWebView.loadData(mHtml, "text/html", "utf-8"); + mWebView.loadDataWithBaseURL(null, mHtml, "text/html", "utf-8", null); } @Override -- cgit v1.2.3