diff options
4 files changed, 1 insertions, 47 deletions
diff --git a/res/xml/accessibility_preferences.xml b/res/xml/accessibility_preferences.xml index 8e1d8f23..68bc4840 100644 --- a/res/xml/accessibility_preferences.xml +++ b/res/xml/accessibility_preferences.xml @@ -36,15 +36,6 @@ android:key="force_userscalable" android:summary="@string/pref_force_userscalable_summary" android:title="@string/pref_force_userscalable" /> - - <ListPreference - android:defaultValue="MEDIUM" - android:dialogTitle="@string/pref_default_zoom_dialogtitle" - android:entries="@array/pref_default_zoom_choices" - android:entryValues="@array/pref_default_zoom_values" - android:key="default_zoom" - android:title="@string/pref_default_zoom" /> - </PreferenceCategory> <!-- // SWE_TODO: Commenting out inverted rendering settings diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 7d6e3f92..9ba3c31e 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -246,7 +246,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, settings.setLightTouchEnabled(enableLightTouch()); settings.setNavDump(enableNavDump()); settings.setDefaultTextEncodingName(getDefaultTextEncoding()); - settings.setDefaultZoom(getDefaultZoom()); settings.setMinimumFontSize(getMinimumFontSize()); settings.setMinimumLogicalFontSize(getMinimumFontSize()); settings.setTextZoom(getTextZoom()); @@ -752,12 +751,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, return mPrefs.getBoolean(PREF_ALLOW_MEDIA_DOWNLOADS, defaultAllowMediaDownloadsValue); } - // TODO: Cache - public ZoomDensity getDefaultZoom() { - String zoom = mPrefs.getString(PREF_DEFAULT_ZOOM, "MEDIUM"); - return ZoomDensity.valueOf(zoom); - } - public boolean loadPageInOverviewMode() { return mPrefs.getBoolean(PREF_LOAD_PAGE, true); } diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index bb63f044..eb9fe534 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -38,7 +38,6 @@ public interface PreferenceKeys { static final String PREF_AUTOFIT_PAGES = "autofit_pages"; static final String PREF_BLOCK_POPUP_WINDOWS = "block_popup_windows"; static final String PREF_DEFAULT_TEXT_ENCODING = "default_text_encoding"; - static final String PREF_DEFAULT_ZOOM = "default_zoom"; static final String PREF_ENABLE_JAVASCRIPT = "enable_javascript"; static final String PREF_ENABLE_MEMORY_MONITOR = "enable_memory_monitor"; static final String PREF_ALLOW_MEDIA_DOWNLOADS = "allow_media_downloads"; diff --git a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java index 20541655..46fdd426 100644 --- a/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java +++ b/src/com/android/browser/preferences/AccessibilityPreferencesFragment.java @@ -49,12 +49,6 @@ public class AccessibilityPreferencesFragment extends PreferenceFragment e.setOnPreferenceChangeListener(this); updateTextZoomSummary(e, settings.getTextZoom()); - e = findPreference(PreferenceKeys.PREF_DEFAULT_ZOOM); - e.setOnPreferenceChangeListener(this); - e.setSummary(getVisualDefaultZoomName( - getPreferenceScreen().getSharedPreferences() - .getString(PreferenceKeys.PREF_DEFAULT_ZOOM, null))); - /* SWE: Comment out double tap zoom feature e = findPreference(PreferenceKeys.PREF_DOUBLE_TAP_ZOOM); e.setOnPreferenceChangeListener(this); @@ -80,26 +74,6 @@ public class AccessibilityPreferencesFragment extends PreferenceFragment } } - private CharSequence getVisualDefaultZoomName(String enumName) { - Resources res = getActivity().getResources(); - CharSequence[] visualNames = res.getTextArray(R.array.pref_default_zoom_choices); - CharSequence[] enumNames = res.getTextArray(R.array.pref_default_zoom_values); - - // Sanity check - if (visualNames.length != enumNames.length) { - return ""; - } - - int length = enumNames.length; - for (int i = 0; i < length; i++) { - if (enumNames[i].equals(enumName)) { - return visualNames[i]; - } - } - - return ""; - } - void updateMinFontSummary(Preference pref, int minFontSize) { Context c = getActivity(); pref.setSummary(c.getString(R.string.pref_min_font_size_value, minFontSize)); @@ -129,10 +103,7 @@ public class AccessibilityPreferencesFragment extends PreferenceFragment } Log.d("AccessibilityPref", "User clicked on " + pref.getKey()); - if (pref.getKey().equals(PreferenceKeys.PREF_DEFAULT_ZOOM)) { - pref.setSummary(getVisualDefaultZoomName((String) objValue)); - return true; - } else if (PreferenceKeys.PREF_MIN_FONT_SIZE.equals(pref.getKey())) { + if (PreferenceKeys.PREF_MIN_FONT_SIZE.equals(pref.getKey())) { updateMinFontSummary(pref, BrowserSettings .getAdjustedMinimumFontSize((Integer) objValue)); } |