summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/res
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-28 20:45:12 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-28 20:45:12 +0100
commitcb3133edef468c755b18d822c6873d6eeffe5183 (patch)
treebf7d9e43195283f8dc5da95498c5fda7146578e2 /packages/SettingsProvider/res
parenta3edd3be2ce0504cb485573b34cc32d60fecfe7a (diff)
parent141e0295436eeb0d0bd0cf00be58ffc9486fc2b4 (diff)
downloadframeworks_base-cb3133edef468c755b18d822c6873d6eeffe5183.zip
frameworks_base-cb3133edef468c755b18d822c6873d6eeffe5183.tar.gz
frameworks_base-cb3133edef468c755b18d822c6873d6eeffe5183.tar.bz2
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'packages/SettingsProvider/res')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index afcd05e..210a096 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -185,6 +185,9 @@
>0 is milliseconds of screen-off time after which battery sounds will not play -->
<integer name="def_low_battery_sound_timeout">0</integer>
+ <!-- Default for Settings.System.VIBRATE_WHEN_RINGING enabled -->
+ <bool name="def_vibrate_when_ringing_enabled">false</bool>
+
<!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting,
which is a comma separated list of packages that no longer need confirmation
for immersive mode.