commit 467813fba07c4dcc4ce350a3d4576f5739c5c940
author Mathew Inwood <mathewi@google.com> Fri Sep 02 15:43:17 2011 +0100
committer Mathew Inwood <mathewi@google.com> Mon Sep 05 13:38:54 2011 +0100
tree d54953b7dd04dd058feaba6265139076d58ddf17
parent 012dcd474cd3980aa206e4b7a31fa67114f56d54

More fine-grained config for 'Search result preloading' setting.

Instead of a checkbox, it's now a setting always/wifi only/never.

Bug: 5086576
Change-Id: I265a22968eafee547571dc86c10c5d5421a305e8

res/xml/bandwidth_preferences.xml

diff --git a/res/xml/bandwidth_preferences.xml b/res/xml/bandwidth_preferences.xml
index 0767ac5..8a31304 100644
--- a/res/xml/bandwidth_preferences.xml
+++ b/res/xml/bandwidth_preferences.xml
@@ -16,11 +16,14 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <CheckBoxPreference
-        android:key="preload_enabled"
+    <ListPreference
+        android:key="preload_when"
         android:title="@string/pref_data_preload_title"
         android:summary="@string/pref_data_preload_summary"
-        android:defaultValue="false" />
+        android:defaultValue="@string/pref_data_preload_value_wifi_only"
+        android:entries="@array/pref_data_preload_choices"
+        android:entryValues="@array/pref_data_preload_values"
+        android:dialogTitle="@string/pref_data_preload_dialogtitle" />
 
     <CheckBoxPreference
         android:key="load_images"