diff options
| author | Ed Heyl <ed@google.com> | 2011-10-25 20:12:30 +0000 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-10-25 20:12:30 +0000 |
| commit | 7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611 (patch) | |
| tree | 31c8833cd4b12055b53629384fb499fad6066a84 /src/com/android/browser | |
| parent | 1e85ec320b15cde84794b6de82b2ae7200704aa1 (diff) | |
| parent | 7af87583a7c732b1f1a7dbe46f446444b77440a5 (diff) | |
| download | packages_apps_Browser-7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611.tar.gz packages_apps_Browser-7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611.tar.bz2 packages_apps_Browser-7f2b28c8a5c92dff6a85d1f17a3b5d52c0429611.zip | |
merge ics-mr0
Change-Id: Ifc31b8464766d17b2f46183cbe0e7309445b07dc
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/preferences/AccessibilityPreferencesFragment.java | 23 | ||||
| -rw-r--r-- | src/com/android/browser/preferences/FontSizePreview.java | 5 |
2 files changed, 25 insertions, 3 deletions
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 9a0c3d78f..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 = "<html><head><style type=\"text/css\">p { margin: 2px auto;}</style><body><p style=\"font-size: 4pt\">%s</p><p style=\"font-size: 8pt\">%s</p><p style=\"font-size: 10pt\">%s</p><p style=\"font-size: 14pt\">%s</p><p style=\"font-size: 18pt\">%s</p></body></html>"; + static final String HTML_FORMAT = "<!DOCTYPE html><html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"><style type=\"text/css\">p { margin: 2px auto;}</style><body><p style=\"font-size: 4pt\">%s</p><p style=\"font-size: 8pt\">%s</p><p style=\"font-size: 10pt\">%s</p><p style=\"font-size: 14pt\">%s</p><p style=\"font-size: 18pt\">%s</p></body></html>"; 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", null); + mWebView.loadDataWithBaseURL(null, mHtml, "text/html", "utf-8", null); } @Override |