diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-14 18:49:27 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-11-18 22:33:47 +0000 |
| commit | 84aa3aca0de351c697a5ff9476be78e1e2c234da (patch) | |
| tree | ead14f3d406ab72d516f4fb318d7acc9335b0d7f | |
| parent | 849d51fa14623d6e2b0359920a30bd322c0e6899 (diff) | |
| download | android_frameworks_base-84aa3aca0de351c697a5ff9476be78e1e2c234da.tar.gz android_frameworks_base-84aa3aca0de351c697a5ff9476be78e1e2c234da.tar.bz2 android_frameworks_base-84aa3aca0de351c697a5ff9476be78e1e2c234da.zip | |
SettingsProvider : Add ability to override default volumes
Change-Id: I5e1a5e5a7e872f9ead1700af0da09a3f2efd6e84
(cherry picked from commit 27903ad31fcf538ddb49d6e8bf9d597a1c80489a)
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 7 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 37 |
2 files changed, 37 insertions, 7 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 509ed1d5e96..d36dcfff6b7 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -238,4 +238,11 @@ <!-- Default value of Settings.System.ENABLE_PEOPLE_LOOKUP --> <integer name="def_people_lookup">1</integer> + <integer name="def_volume_music">-1</integer> + <integer name="def_volume_ring">-1</integer> + <integer name="def_volume_system">-1</integer> + <integer name="def_volume_voice">-1</integer> + <integer name="def_volume_alarm">-1</integer> + <integer name="def_volume_notification">-1</integer> + <integer name="def_volume_btsco">-1</integer> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 2ff2b5a8b77..a1a8658e216 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -27,6 +27,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; +import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.database.Cursor; import android.database.SQLException; @@ -1952,26 +1953,48 @@ public class DatabaseHelper extends SQLiteOpenHelper { stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)" + " VALUES(?,?);"); + Resources res = mContext.getResources(); + + int defaultVolume = res.getInteger(R.integer.def_volume_music); loadSetting(stmt, Settings.System.VOLUME_MUSIC, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_MUSIC]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_MUSIC])); + + defaultVolume = res.getInteger(R.integer.def_volume_ring); loadSetting(stmt, Settings.System.VOLUME_RING, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_RING]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_RING])); + + defaultVolume = res.getInteger(R.integer.def_volume_system); loadSetting(stmt, Settings.System.VOLUME_SYSTEM, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_SYSTEM]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_SYSTEM])); + + defaultVolume = res.getInteger(R.integer.def_volume_voice); loadSetting( stmt, Settings.System.VOLUME_VOICE, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_VOICE_CALL]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_VOICE_CALL])); + + defaultVolume = res.getInteger(R.integer.def_volume_alarm); loadSetting(stmt, Settings.System.VOLUME_ALARM, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_ALARM]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_ALARM])); + + defaultVolume = res.getInteger(R.integer.def_volume_notification); loadSetting( stmt, Settings.System.VOLUME_NOTIFICATION, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_NOTIFICATION]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_NOTIFICATION])); + + defaultVolume = res.getInteger(R.integer.def_volume_btsco); loadSetting( stmt, Settings.System.VOLUME_BLUETOOTH_SCO, - AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_BLUETOOTH_SCO]); + (defaultVolume >= 0 ? defaultVolume : + AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_BLUETOOTH_SCO])); // By default: // - ringtones, notification, system and music streams are affected by ringer mode |