diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-12-11 15:21:02 -0800 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-12-11 15:21:02 -0800 |
| commit | ace7404de8b9a5bd7566027a8a90d36d099a46f4 (patch) | |
| tree | c01fc20897525d49aecd56c4fc6a672fceed3089 /packages/SettingsProvider/res/values/defaults.xml | |
| parent | fba73030d674b3cd29ffe8519aa41738b54ae827 (diff) | |
| parent | d7337fb97aab0b28c6ca60f6553d03feb1000991 (diff) | |
| download | frameworks_base-ace7404de8b9a5bd7566027a8a90d36d099a46f4.zip frameworks_base-ace7404de8b9a5bd7566027a8a90d36d099a46f4.tar.gz frameworks_base-ace7404de8b9a5bd7566027a8a90d36d099a46f4.tar.bz2 | |
resolved conflicts for merge of d7337fb9 to master
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
Diffstat (limited to 'packages/SettingsProvider/res/values/defaults.xml')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 282ea8a..82627c0 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -73,6 +73,8 @@ <integer name="def_lockscreen_sounds_enabled">1</integer> <string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string> <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string> + <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string> + <bool name="def_lockscreen_disabled">false</bool> <bool name="def_device_provisioned">false</bool> |