diff options
| author | Sam Mortimer <sam@mortimer.me.uk> | 2013-03-18 18:24:07 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-26 02:34:25 -0700 |
| commit | aa107df6c5559639daa26883b78edd8fe32cec87 (patch) | |
| tree | d69fe1804d397a8e403a72cbdee53f32e743146f /packages/SettingsProvider | |
| parent | 2a2cc073b2b8918b5bd18c535f53de73d578db81 (diff) | |
| download | frameworks_base-aa107df6c5559639daa26883b78edd8fe32cec87.zip frameworks_base-aa107df6c5559639daa26883b78edd8fe32cec87.tar.gz frameworks_base-aa107df6c5559639daa26883b78edd8fe32cec87.tar.bz2 | |
[1/2] Forward port power connect/disconnect notification support
Original commit info:
[1/2] Power connect/disconnect notification support
part 1/2: frameworks/base PowerUI and Settings
http://review.cyanogenmod.org/#/c/35241/
part 2/2: packages/apps/Settings Sound settings
http://review.cyanogenmod.org/#/c/35242/
V-Old_Change-Id: I36a6b9f924d2cd52191a8e83a744745b37c5b068
OldChange-Id: Ib865e1c296cb8e1d957b2a48616c88ceaba5c008
Change-Id: I5db20ef23bdb644e2af06e8dcbc8fbd0cf7ce321
Signed-off-by: STELIX <ssspinni@gmail.com>
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, 10 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 24646eb..d7128cd 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -78,6 +78,10 @@ <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 72a3d8e..cd1546a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1555,6 +1555,12 @@ 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(); |