diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-04-02 15:16:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-02 15:16:09 -0700 |
| commit | 2e939f9d49bc6855bac2eb650f4cbf55f5bdf477 (patch) | |
| tree | 60e65bad5808584edc1a81ecc54cfd121e0f9a46 | |
| parent | 94ba14c99e85b260e831619b339d728e6e486998 (diff) | |
| parent | a1ff2e0407bd9bf96f9159a7917b71217060887b (diff) | |
| download | frameworks_base-2e939f9d49bc6855bac2eb650f4cbf55f5bdf477.zip frameworks_base-2e939f9d49bc6855bac2eb650f4cbf55f5bdf477.tar.gz frameworks_base-2e939f9d49bc6855bac2eb650f4cbf55f5bdf477.tar.bz2 | |
Merge "SettingsProvider: Initialize defaults for CM features" into cm-10.1
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 19 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 9 |
2 files changed, 27 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index b8c1761..5109b1f 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -170,6 +170,23 @@ <!-- Default for Settings.Secure.USER_SETUP_COMPLETE --> <bool name="def_user_setup_complete">false</bool> - <!-- Default for Settings.System.STATUS_BAR_BATTERY --> + <!-- Default for Settings.System.STATUS_BAR_BATTERY. + 0. Icon + 1. Percentage + 2. Circle + 3. Circle with Percentage + 4. None/Hidden --> <integer name="def_battery_style">0</integer> + + <!-- Default for Settings.System.STATUS_BAR_NOTIF_COUNT. --> + <integer name="def_notif_count">0</integer> + + <!-- Default for Settings.System.QS_QUICK_PULLDOWN. + 0. Off + 1. Right + 2. Left --> + <integer name="def_qs_quick_pulldown">0</integer> + + <!-- Default for Settings.System.LOCKSCREEN_TARGETS. --> + <string name="def_lockscreen_targets" translatable="false"></string> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 289f9cc..32fd39d 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1974,6 +1974,15 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.System.STATUS_BAR_BATTERY, R.integer.def_battery_style); + + loadIntegerSetting(stmt, Settings.System.STATUS_BAR_NOTIF_COUNT, + R.integer.def_notif_count); + + loadIntegerSetting(stmt, Settings.System.QS_QUICK_PULLDOWN, + R.integer.def_qs_quick_pulldown); + + loadStringSetting(stmt, Settings.System.LOCKSCREEN_TARGETS, + R.string.def_lockscreen_targets); } finally { if (stmt != null) stmt.close(); } |