diff options
| author | Mathew Inwood <mathewi@google.com> | 2011-09-08 04:01:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-08 04:01:32 -0700 |
| commit | 6b6f6c5b112fdb85d05f415bec9818d38b586b7a (patch) | |
| tree | 25e5538f287a11de21a109240e0bc1f65817c260 | |
| parent | 8c50177f20772ab52c9d6214a7da9e98e574c9de (diff) | |
| parent | 7590598c87d7e910df6567c377192e93c0e2f771 (diff) | |
| download | packages_apps_Browser-6b6f6c5b112fdb85d05f415bec9818d38b586b7a.zip packages_apps_Browser-6b6f6c5b112fdb85d05f415bec9818d38b586b7a.tar.gz packages_apps_Browser-6b6f6c5b112fdb85d05f415bec9818d38b586b7a.tar.bz2 | |
Merge "Change default preload setting to 'Always'."
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/xml/bandwidth_preferences.xml | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 2 |
3 files changed, 3 insertions, 2 deletions
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 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, } private String getDefaultPreloadSetting() { - return getPreloadOnWifiOnlyPreferenceString(mContext); + return mContext.getResources().getString(R.string.pref_data_preload_default_value); } public String getPreloadEnabled() { |