summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2012-08-09 10:41:37 -0400
committerJohn Spurlock <jspurlock@google.com>2012-08-09 10:41:37 -0400
commit634471edc409f00f38633e334cd6853954a2b093 (patch)
tree9d89ab2dd8afa32b13f07e242cb376119cb042a3 /packages
parentb7649306e9c8c06128c0f405f9da97c95f8be336 (diff)
downloadframeworks_base-634471edc409f00f38633e334cd6853954a2b093.zip
frameworks_base-634471edc409f00f38633e334cd6853954a2b093.tar.gz
frameworks_base-634471edc409f00f38633e334cd6853954a2b093.tar.bz2
Load default Dream settings into a clean db.
Set the Dream defaults during onCreate, not only onUpgrade. Bug: 6959513 Change-Id: Ia93097edaf1150813c75b6be809db9c97987868f
Diffstat (limited to 'packages')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 7c6ce73..4552a55 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1697,6 +1697,13 @@ public class DatabaseHelper extends SQLiteOpenHelper {
loadIntegerSetting(stmt, Settings.Secure.WIFI_MAX_DHCP_RETRY_COUNT,
R.integer.def_max_dhcp_retries);
+
+ loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ENABLED,
+ R.bool.def_screensaver_enabled);
+ loadBooleanSetting(stmt, Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,
+ R.bool.def_screensaver_activate_on_dock);
+ loadStringSetting(stmt, Settings.Secure.SCREENSAVER_COMPONENT,
+ R.string.def_screensaver_component);
} finally {
if (stmt != null) stmt.close();
}