diff options
| author | John Reck <jreck@google.com> | 2011-07-08 10:45:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-08 10:45:45 -0700 |
| commit | 49632a0994cd3d26cb376c140f10d978ac55542d (patch) | |
| tree | fe4c6fc1966986aab979d3ceffc9c82b3b860273 | |
| parent | 7e77c42fa87d92cd84b4c0102c95c2d88911e595 (diff) | |
| parent | 1a435e7752c324b34246546faa7c9dd8b719446c (diff) | |
| download | packages_apps_browser-49632a0994cd3d26cb376c140f10d978ac55542d.zip packages_apps_browser-49632a0994cd3d26cb376c140f10d978ac55542d.tar.gz packages_apps_browser-49632a0994cd3d26cb376c140f10d978ac55542d.tar.bz2 | |
Merge "Move load images to bandwidth settings"
| -rw-r--r-- | res/xml/advanced_preferences.xml | 6 | ||||
| -rw-r--r-- | res/xml/bandwidth_preferences.xml | 6 | ||||
| -rw-r--r-- | src/com/android/browser/PreferenceKeys.java | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml index 4a2823e..6e58164 100644 --- a/res/xml/advanced_preferences.xml +++ b/res/xml/advanced_preferences.xml @@ -76,12 +76,6 @@ android:defaultValue="true" android:title="@string/pref_content_block_popups" /> - <CheckBoxPreference - android:key="load_images" - android:defaultValue="true" - android:title="@string/pref_content_load_images" - android:summary="@string/pref_content_load_images_summary" /> - <ListPreference android:key="default_text_encoding" android:title="@string/pref_default_text_encoding" diff --git a/res/xml/bandwidth_preferences.xml b/res/xml/bandwidth_preferences.xml index 0eb4c21..0767ac5 100644 --- a/res/xml/bandwidth_preferences.xml +++ b/res/xml/bandwidth_preferences.xml @@ -22,4 +22,10 @@ android:summary="@string/pref_data_preload_summary" android:defaultValue="false" /> + <CheckBoxPreference + android:key="load_images" + android:defaultValue="true" + android:title="@string/pref_content_load_images" + android:summary="@string/pref_content_load_images_summary" /> + </PreferenceScreen> diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index 144d505..08ee91f 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -37,7 +37,6 @@ public interface PreferenceKeys { 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_LOAD_IMAGES = "load_images"; static final String PREF_LOAD_PAGE = "load_page"; static final String PREF_OPEN_IN_BACKGROUND = "open_in_background"; static final String PREF_PLUGIN_STATE = "plugin_state"; @@ -98,5 +97,6 @@ public interface PreferenceKeys { // Keys for bandwidth_preferences.xml // ---------------------- static final String PREF_DATA_PRELOAD = "preload_enabled"; + static final String PREF_LOAD_IMAGES = "load_images"; } |