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 /res | |
| parent | 7e77c42fa87d92cd84b4c0102c95c2d88911e595 (diff) | |
| parent | 1a435e7752c324b34246546faa7c9dd8b719446c (diff) | |
| download | android_packages_apps_Gello-49632a0994cd3d26cb376c140f10d978ac55542d.tar.gz android_packages_apps_Gello-49632a0994cd3d26cb376c140f10d978ac55542d.tar.bz2 android_packages_apps_Gello-49632a0994cd3d26cb376c140f10d978ac55542d.zip | |
Merge "Move load images to bandwidth settings"
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/advanced_preferences.xml | 6 | ||||
| -rw-r--r-- | res/xml/bandwidth_preferences.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml index 4a2823e0..6e58164c 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 0eb4c21d..0767ac52 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> |