summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2013-11-04 00:58:57 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-18 13:03:59 -0800
commit46a77b33666c9407845440516685eb4cbef41ff2 (patch)
tree2c503f0f7a08dc82954c6e2564762c546e3971f3 /packages/SettingsProvider
parent9ca8d4c76a2f80d5a87225d09d0155a43d2263dc (diff)
downloadframeworks_base-46a77b33666c9407845440516685eb4cbef41ff2.zip
frameworks_base-46a77b33666c9407845440516685eb4cbef41ff2.tar.gz
frameworks_base-46a77b33666c9407845440516685eb4cbef41ff2.tar.bz2
Port over linked volumes from 12.1
Implement linked volumes and add upgrade path. Change-Id: Ibbeff656fcaaa4a2ff79de530b48b216df271b21 frameworks: read VOLUME_LINK_NOTIFICATION from proper table Change-Id: I15e9caa18f307a51a732c7a59013bbbb234a7477 Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit 1b7cfa1716017e0d03c9693428c21d8e11c5dc0a) fix Notification volume slider linking Change-Id: I0f74485f5c8c2aa7698cf9ba1c60c2c8c967798d Signed-off-by: Roman Birg <roman@cyngn.com> Improve SeekBarVolumizer behavior with unlinked streams - Fix notification stream enabling at 0 volume - Fix the notification slider being set when moving ringer stream Change-Id: If3705cc833c07f726f8ad7b1ec79a42e86e8ff22 Signed-off-by: Roman Birg <roman@cyngn.com> base: Fix notification sounds for wifi only devices The linking of voice & notification doesn't take into account the fact that a device may not actually have voice capabilities. Whenever checking whether or not to link notification and ring volumes, also verify that the device really is voice capable. Change-Id: Iae49302d3b5934d36b182e289e4975f5dd85b834 frameworks: fix setting up linked notification stream on boot updateStreamVolumeAlias() was previously responsible for checking the linked notification variable and mapping the notification stream, but the setting to read whether the notifications were linked was read in after that method had run which was responsible for linking them. Extract the logic and re-run it again after reading the persisted settings. Change-Id: Ia62bf3ca072def54ec6ebf4f9e865d9c913e3bc4 Signed-off-by: Roman Birg <roman@cyngn.com> fixup volume stream linking - Make the SeekBarVolumizer move notification and ringer streams when linked and moving ringer. - Fix initial state causing volume stream seek bar to be set to 0 initially - Clean up AudioService initialization code Change-Id: Ia11a7a392e5eb3ef862147843e365d5f20eaf90a Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index b3ec295..02e4e88 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1932,7 +1932,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
if (upgradeVersion < 116) {
moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_SECURE,
- new String[]{CMSettings.Secure.VOLUME_LINK_NOTIFICATION}, true);
+ new String[]{Settings.Secure.VOLUME_LINK_NOTIFICATION}, true);
if (mUserHandle == UserHandle.USER_OWNER) {
db.beginTransaction();
SQLiteStatement stmt = null;