diff options
| author | d34d <clark@cyngn.com> | 2015-11-12 12:55:23 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-12 18:03:00 -0800 |
| commit | a16992359a19dd3fd9cc921edc981c8966556e1b (patch) | |
| tree | f1bfd39a233af3e053eb09daa48c4185379c4e88 /packages/SettingsProvider | |
| parent | 11feb561aa1b34263ce200d696a02c0e6f8234a5 (diff) | |
| download | frameworks_base-a16992359a19dd3fd9cc921edc981c8966556e1b.zip frameworks_base-a16992359a19dd3fd9cc921edc981c8966556e1b.tar.gz frameworks_base-a16992359a19dd3fd9cc921edc981c8966556e1b.tar.bz2 | |
fw: Move Global settings to CMSettings
This moves all Settings.Global.* settings, that were added to
CyanogenMod and not used in boot classpath, to CMSettings.
* WAKE_WHEN_PLUGGED_OR_UNPLUGGED
* BLUETOOTH_A2DP_SRC_PRIORITY_PREFIX
* POWER_NOTIFICATIONS_ENABLED
* POWER_NOTIFICATIONS_VIBRATE
* POWER_NOTIFICATIONS_RINGTONE
* ZEN_DISABLE_DUCKING_DURING_MEDIA_PLAYBACK
* WIFI_AUTO_PRIORITIES_CONFIGURATION
Change-Id: I5a23971b278d150c633d2b4ade49a143c4423c26
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index ff695fd..22fcb46 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -93,10 +93,6 @@ <string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string> <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string> - <bool name="def_power_notifications_enabled">false</bool> - <bool name="def_power_notifications_vibrate">false</bool> - <string name="def_power_notifications_ringtone" translatable="false">content://settings/system/notification_sound</string> - <bool name="def_lockscreen_disabled">false</bool> <bool name="def_device_provisioned">false</bool> <integer name="def_dock_audio_media_enabled">1</integer> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index ec2dea6..694eda5 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1558,12 +1558,6 @@ class DatabaseHelper extends SQLiteOpenHelper { + " VALUES(?,?);"); loadStringSetting(stmt, Settings.Global.WIRELESS_CHARGING_STARTED_SOUND, R.string.def_wireless_charging_started_sound); - loadBooleanSetting(stmt, Settings.Global.POWER_NOTIFICATIONS_ENABLED, - R.bool.def_power_notifications_enabled); - loadBooleanSetting(stmt, Settings.Global.POWER_NOTIFICATIONS_VIBRATE, - R.bool.def_power_notifications_vibrate); - loadStringSetting(stmt, Settings.Global.POWER_NOTIFICATIONS_RINGTONE, - R.string.def_power_notifications_ringtone); db.setTransactionSuccessful(); } finally { db.endTransaction(); |