diff options
| author | 2019-05-13 18:18:31 +0000 | |
|---|---|---|
| committer | 2019-05-13 18:18:31 +0000 | |
| commit | 5bc29e371ce138892f3bca89edaeb7b81e913872 (patch) | |
| tree | 09a29eabab11fe027537f837a66a60aa982e09f4 | |
| parent | c410ad8acae575e5840d987d43a3e6d4a6803efb (diff) | |
| parent | 95e879aaf15f0e37ff77a5d69054cc4566abc367 (diff) | |
Merge "Change bubbles to be off by default" into qt-dev
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 15 |
2 files changed, 15 insertions, 2 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 715e1ebe31ac..dd72d5779c19 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -225,7 +225,7 @@ <bool name="def_charging_sounds_enabled">true</bool> <!-- Default for Settings.Secure.NOTIFICATION_BUBBLES --> - <bool name="def_notification_bubbles">true</bool> + <bool name="def_notification_bubbles">false</bool> <!-- Default for Settings.Secure.AWARE_ENABLED --> <bool name="def_aware_enabled">false</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 82592ceeb710..6558c87aaf3a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -3237,7 +3237,7 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 179; + private static final int SETTINGS_VERSION = 180; private final int mUserId; @@ -4387,6 +4387,19 @@ public class SettingsProvider extends ContentProvider { currentVersion = 179; } + if (currentVersion == 179) { + // Version 178: Reset the default for Secure Settings: NOTIFICATION_BUBBLES + // This is originally set in version 173, however, the default value changed + // so this step is to ensure the value is updated to the correct defaulte + final SettingsState secureSettings = getSecureSettingsLocked(userId); + + secureSettings.insertSettingLocked(Secure.NOTIFICATION_BUBBLES, + getContext().getResources().getBoolean( + R.bool.def_notification_bubbles) ? "1" : "0", null, + true, SettingsState.SYSTEM_PACKAGE_NAME); + + currentVersion = 180; + } // vXXX: Add new settings above this point. |