From dc8748b2bf5653fe5042579c3bf55c5e2cd44ef5 Mon Sep 17 00:00:00 2001 From: Ian Munsie Date: Thu, 9 Nov 2017 22:09:40 +1100 Subject: [PATCH] Ambiences: Do not clobber user set system tones in default ambiences The default ambiences all set the system tones back to the defaults, which is not only redundant since that is what they default to, but also removes user customisations. This effectively renders the default ambiences unusable for users who have customised their ring tone or other tones unless they also customise every default ambience that they intend to use - this is asking users to work around our bug, which is not ideal. Since setting these tones back to default serves literally zero use cases, simply remove them to resolve this issue. This will not have any impact on users who wish to use the default tones by default, since they are still the default. It will however offer a dramatic life improvement to our users who wish to customise their ringtones. Later, we can improve ambiences further to restore the previously set tones when they are unset (assuming they have not since been changed by the user), which would then allow ambiences that also set a sound scheme to work as intended. At that time, we should also remove "ringerVolume" from each of these ambiences (except silent) as that is inappropriate for ambiences to set that are not setting a sound scheme, but for now this is a necessary hack so that the silent profile will work as expected, so that is left in. Signed-off-by: Ian Munsie --- usr/share/ambience/affection/affection.ambience | 9 +-------- usr/share/ambience/fresh/fresh.ambience | 9 +-------- usr/share/ambience/harmony/harmony.ambience | 9 +-------- usr/share/ambience/intense/intense.ambience | 9 +-------- usr/share/ambience/urban/urban.ambience | 9 +-------- usr/share/ambience/vigorous/vigorous.ambience | 9 +-------- 6 files changed, 6 insertions(+), 48 deletions(-) diff --git a/usr/share/ambience/affection/affection.ambience b/usr/share/ambience/affection/affection.ambience index 8a54b87..30dce7e 100644 --- a/usr/share/ambience/affection/affection.ambience +++ b/usr/share/ambience/affection/affection.ambience @@ -9,12 +9,5 @@ "ringerVolume" : 80, "favorite" : false, "timestamp" : "2015-01-01T00:01:05", - "version" : 2, - "ringerToneFile" : { "enabled": 1 }, - "messageToneFile" : { "enabled": 1 }, - "mailToneFile" : { "enabled": 1 }, - "internetCallToneFile" : { "enabled": 1 }, - "chatToneFile" : { "enabled": 1 }, - "calendarToneFile" : { "enabled": 1 }, - "clockAlarmToneFile" : { "enabled": 1 } + "version" : 2 } diff --git a/usr/share/ambience/fresh/fresh.ambience b/usr/share/ambience/fresh/fresh.ambience index b302c3b..9f1c5a0 100644 --- a/usr/share/ambience/fresh/fresh.ambience +++ b/usr/share/ambience/fresh/fresh.ambience @@ -9,12 +9,5 @@ "ringerVolume" : 80, "favorite" : false, "timestamp" : "2015-01-01T00:01:03", - "version" : 2, - "ringerToneFile" : { "enabled": 1 }, - "messageToneFile" : { "enabled": 1 }, - "mailToneFile" : { "enabled": 1 }, - "internetCallToneFile" : { "enabled": 1 }, - "chatToneFile" : { "enabled": 1 }, - "calendarToneFile" : { "enabled": 1 }, - "clockAlarmToneFile" : { "enabled": 1 } + "version" : 2 } diff --git a/usr/share/ambience/harmony/harmony.ambience b/usr/share/ambience/harmony/harmony.ambience index 86ab0df..9ccc11b 100644 --- a/usr/share/ambience/harmony/harmony.ambience +++ b/usr/share/ambience/harmony/harmony.ambience @@ -9,12 +9,5 @@ "ringerVolume" : 80, "favorite" : false, "timestamp" : "2015-01-01T00:01:02", - "version" : 2, - "ringerToneFile" : { "enabled": 1 }, - "messageToneFile" : { "enabled": 1 }, - "mailToneFile" : { "enabled": 1 }, - "internetCallToneFile" : { "enabled": 1 }, - "chatToneFile" : { "enabled": 1 }, - "calendarToneFile" : { "enabled": 1 }, - "clockAlarmToneFile" : { "enabled": 1 } + "version" : 2 } diff --git a/usr/share/ambience/intense/intense.ambience b/usr/share/ambience/intense/intense.ambience index 61d4053..fa7d336 100644 --- a/usr/share/ambience/intense/intense.ambience +++ b/usr/share/ambience/intense/intense.ambience @@ -9,12 +9,5 @@ "ringerVolume" : 80, "favorite" : false, "timestamp" : "2015-01-01T00:01:04", - "version" : 2, - "ringerToneFile" : { "enabled": 1 }, - "messageToneFile" : { "enabled": 1 }, - "mailToneFile" : { "enabled": 1 }, - "internetCallToneFile" : { "enabled": 1 }, - "chatToneFile" : { "enabled": 1 }, - "calendarToneFile" : { "enabled": 1 }, - "clockAlarmToneFile" : { "enabled": 1 } + "version" : 2 } diff --git a/usr/share/ambience/urban/urban.ambience b/usr/share/ambience/urban/urban.ambience index 6afbfb6..272c3b1 100644 --- a/usr/share/ambience/urban/urban.ambience +++ b/usr/share/ambience/urban/urban.ambience @@ -9,12 +9,5 @@ "ringerVolume" : 80, "favorite" : false, "timestamp" : "2015-01-01T00:01:01", - "version" : 2, - "ringerToneFile" : { "enabled": 1 }, - "messageToneFile" : { "enabled": 1 }, - "mailToneFile" : { "enabled": 1 }, - "internetCallToneFile" : { "enabled": 1 }, - "chatToneFile" : { "enabled": 1 }, - "calendarToneFile" : { "enabled": 1 }, - "clockAlarmToneFile" : { "enabled": 1 } + "version" : 2 } diff --git a/usr/share/ambience/vigorous/vigorous.ambience b/usr/share/ambience/vigorous/vigorous.ambience index e3e5584..30fb0e4 100644 --- a/usr/share/ambience/vigorous/vigorous.ambience +++ b/usr/share/ambience/vigorous/vigorous.ambience @@ -9,12 +9,5 @@ "ringerVolume" : 80, "favorite" : false, "timestamp" : "2015-01-01T00:01:00", - "version" : 2, - "ringerToneFile" : { "enabled": 1 }, - "messageToneFile" : { "enabled": 1 }, - "mailToneFile" : { "enabled": 1 }, - "internetCallToneFile" : { "enabled": 1 }, - "chatToneFile" : { "enabled": 1 }, - "calendarToneFile" : { "enabled": 1 }, - "clockAlarmToneFile" : { "enabled": 1 } + "version" : 2 } -- 2.11.0