diff options
author | Grace Kloba <klobag@google.com> | 2009-06-25 11:24:39 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-25 11:24:39 -0700 |
commit | e0f11cc13c4dfa739098026bf0daf44129445534 (patch) | |
tree | c6298c1847e0fc8495a130ece28af2b45e0ad082 /src/com/android/browser/BrowserPreferencesPage.java | |
parent | 2a5d17f0f379dd1452db8104808980ee01c684e9 (diff) | |
parent | 2f83068b9e8835f97010bc2ee1d77f3a13827ae4 (diff) | |
download | android_packages_apps_Gello-e0f11cc13c4dfa739098026bf0daf44129445534.tar.gz android_packages_apps_Gello-e0f11cc13c4dfa739098026bf0daf44129445534.tar.bz2 android_packages_apps_Gello-e0f11cc13c4dfa739098026bf0daf44129445534.zip |
am 2f83068b: Add the ZoomDensity support in the Browser.
Merge commit '2f83068b9e8835f97010bc2ee1d77f3a13827ae4'
* commit '2f83068b9e8835f97010bc2ee1d77f3a13827ae4':
Add the ZoomDensity support in the Browser.
Diffstat (limited to 'src/com/android/browser/BrowserPreferencesPage.java')
-rw-r--r-- | src/com/android/browser/BrowserPreferencesPage.java | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java index 3a9505f7..2524eb8e 100644 --- a/src/com/android/browser/BrowserPreferencesPage.java +++ b/src/com/android/browser/BrowserPreferencesPage.java @@ -60,6 +60,12 @@ public class BrowserPreferencesPage extends PreferenceActivity getPreferenceScreen().getSharedPreferences() .getString(BrowserSettings.PREF_TEXT_SIZE, null)) ); + e = findPreference(BrowserSettings.PREF_DEFAULT_ZOOM); + e.setOnPreferenceChangeListener(this); + e.setSummary(getVisualDefaultZoomName( + getPreferenceScreen().getSharedPreferences() + .getString(BrowserSettings.PREF_DEFAULT_ZOOM, null)) ); + e = findPreference(BrowserSettings.PREF_DEFAULT_TEXT_ENCODING); e.setOnPreferenceChangeListener(this); @@ -135,6 +141,9 @@ public class BrowserPreferencesPage extends PreferenceActivity } else if (pref.getKey().equals(BrowserSettings.PREF_TEXT_SIZE)) { pref.setSummary(getVisualTextSizeName((String) objValue)); return true; + } else if (pref.getKey().equals(BrowserSettings.PREF_DEFAULT_ZOOM)) { + pref.setSummary(getVisualDefaultZoomName((String) objValue)); + return true; } else if (pref.getKey().equals( BrowserSettings.PREF_DEFAULT_TEXT_ENCODING)) { pref.setSummary((String) objValue); @@ -157,24 +166,44 @@ public class BrowserPreferencesPage extends PreferenceActivity } return true; } - + private CharSequence getVisualTextSizeName(String enumName) { - CharSequence[] visualNames = - getResources().getTextArray(R.array.pref_text_size_choices); - CharSequence[] enumNames = - getResources().getTextArray(R.array.pref_text_size_values); - + CharSequence[] visualNames = getResources().getTextArray( + R.array.pref_text_size_choices); + CharSequence[] enumNames = getResources().getTextArray( + R.array.pref_text_size_values); + // Sanity check if (visualNames.length != enumNames.length) { return ""; } - + for (int i = 0; i < enumNames.length; i++) { if (enumNames[i].equals(enumName)) { return visualNames[i]; } } - + + return ""; + } + + private CharSequence getVisualDefaultZoomName(String enumName) { + CharSequence[] visualNames = getResources().getTextArray( + R.array.pref_default_zoom_choices); + CharSequence[] enumNames = getResources().getTextArray( + R.array.pref_default_zoom_values); + + // Sanity check + if (visualNames.length != enumNames.length) { + return ""; + } + + for (int i = 0; i < enumNames.length; i++) { + if (enumNames[i].equals(enumName)) { + return visualNames[i]; + } + } + return ""; } } |