Move load images to bandwidth settings
Bug: 4726553
Change-Id: I9c0c1d250eb84bcd6c954d492479f0f288d59236
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 @@
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 @@
// Keys for bandwidth_preferences.xml
// ----------------------
static final String PREF_DATA_PRELOAD = "preload_enabled";
+ static final String PREF_LOAD_IMAGES = "load_images";
}