Change default preload setting to 'Always'.
Also some tidying up to that the default is only specified in a
single place.
Change-Id: I6d66739a8b0d307f8af3c29c62d122a3044c4943
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 77e25a3..9bf1dcb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -656,6 +656,7 @@
<string name="pref_data_preload_value_never" translatable="false">NEVER</string>
<string name="pref_data_preload_value_wifi_only" translatable="false">WIFI_ONLY</string>
<string name="pref_data_preload_value_always" translatable="false">ALWAYS</string>
+ <string name="pref_data_preload_default_value" translatable="false">@string/pref_data_preload_value_always</string>
<string-array name="pref_data_preload_values" translatable="false">
<item><xliff:g>@string/pref_data_preload_value_never</xliff:g></item>
<item><xliff:g>@string/pref_data_preload_value_wifi_only</xliff:g></item>
diff --git a/res/xml/bandwidth_preferences.xml b/res/xml/bandwidth_preferences.xml
index 8a31304..f294026 100644
--- a/res/xml/bandwidth_preferences.xml
+++ b/res/xml/bandwidth_preferences.xml
@@ -20,7 +20,7 @@
android:key="preload_when"
android:title="@string/pref_data_preload_title"
android:summary="@string/pref_data_preload_summary"
- android:defaultValue="@string/pref_data_preload_value_wifi_only"
+ android:defaultValue="@string/pref_data_preload_default_value"
android:entries="@array/pref_data_preload_choices"
android:entryValues="@array/pref_data_preload_values"
android:dialogTitle="@string/pref_data_preload_dialogtitle" />
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index ce8a9c1..6b8daec 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -789,7 +789,7 @@
}
private String getDefaultPreloadSetting() {
- return getPreloadOnWifiOnlyPreferenceString(mContext);
+ return mContext.getResources().getString(R.string.pref_data_preload_default_value);
}
public String getPreloadEnabled() {