diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:52 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:52 -0800 |
| commit | ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6 (patch) | |
| tree | f4f3c7225a6ed8d870f32cedbbc8f6e41b5633e7 /res/xml/browser_preferences.xml | |
| parent | ba6d7b853c32ad6c3be26c443daa61f322bcfdc2 (diff) | |
| download | packages_apps_Browser-ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6.tar.gz packages_apps_Browser-ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6.tar.bz2 packages_apps_Browser-ed217d91fb3f1a8f4e75ab36ef81d72ef9f4e6d6.zip | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'res/xml/browser_preferences.xml')
| -rw-r--r-- | res/xml/browser_preferences.xml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/res/xml/browser_preferences.xml b/res/xml/browser_preferences.xml index 08fd83576..cd4032265 100644 --- a/res/xml/browser_preferences.xml +++ b/res/xml/browser_preferences.xml @@ -28,6 +28,14 @@ android:entryValues="@array/pref_text_size_values" android:dialogTitle="@string/pref_text_size_dialogtitle" /> + <ListPreference + android:key="default_text_encoding" + android:title="@string/pref_default_text_encoding" + android:defaultValue="@string/pref_default_text_encoding_default" + android:entries="@array/pref_default_text_encoding_choices" + android:entryValues="@array/pref_default_text_encoding_values" + android:dialogTitle="@string/pref_default_text_encoding_dialogtitle" /> + <CheckBoxPreference android:key="block_popup_windows" android:defaultValue="true" @@ -56,8 +64,8 @@ android:title="@string/pref_content_open_in_background" android:summary="@string/pref_content_open_in_background_summary" /> - <EditTextPreference - android:key="homepage" + <com.android.browser.BrowserHomepagePreference + android:key="homepage" android:title="@string/pref_content_homepage" android:singleLine="true" /> @@ -140,8 +148,10 @@ <PreferenceCategory android:title="@string/pref_extras_title"> + <!-- This setting is named "Enable Gears" but is actually + tied to enabling all plugins. --> <CheckBoxPreference - android:key="enable_gears" + android:key="enable_plugins" android:defaultValue="true" android:title="@string/pref_extras_gears_enable" android:summary="@string/pref_extras_gears_enable_summary" /> @@ -149,7 +159,7 @@ <Preference android:key="gears_settings" android:persistent="false" - android:dependency="enable_gears" + android:dependency="enable_plugins" android:title="@string/pref_extras_gears_settings" android:summary="@string/pref_extras_gears_settings_summary" /> |