Add settings default handling for STATUS_BAR_SHOW_VIBRATE_ICON

Make the Secure.STATUS_BAR_SHOW_VIBRATE_ICON default configurable

Bug: 253992986
Test: manual - see issue
Change-Id: Ibada490c823a47ef145d9b50cadd4838c687711e
Merged-In: Ibada490c823a47ef145d9b50cadd4838c687711e
This commit is contained in:
Edward Savage-Jones
2022-10-11 07:48:45 +02:00
committed by Steve Elliott
parent 020d3fa7b2
commit f16c38760b
2 changed files with 15 additions and 2 deletions

View File

@@ -314,4 +314,7 @@
<!-- Whether tilt to bright is enabled by default. -->
<bool name="def_wearable_tiltToBrightEnabled">false</bool>
<!-- Whether vibrate icon is shown in the status bar by default. -->
<integer name="def_statusBarVibrateIconEnabled">0</integer>
</resources>

View File

@@ -3631,7 +3631,7 @@ public class SettingsProvider extends ContentProvider {
}
private final class UpgradeController {
private static final int SETTINGS_VERSION = 210;
private static final int SETTINGS_VERSION = 211;
private final int mUserId;
@@ -5512,7 +5512,17 @@ public class SettingsProvider extends ContentProvider {
// removed now that feature is enabled for everyone
currentVersion = 210;
}
if (currentVersion == 210) {
final SettingsState secureSettings = getSecureSettingsLocked(userId);
final int defaultValueVibrateIconEnabled = getContext().getResources()
.getInteger(R.integer.def_statusBarVibrateIconEnabled);
secureSettings.insertSettingOverrideableByRestoreLocked(
Secure.STATUS_BAR_SHOW_VIBRATE_ICON,
String.valueOf(defaultValueVibrateIconEnabled),
null /* tag */, true /* makeDefault */,
SettingsState.SYSTEM_PACKAGE_NAME);
currentVersion = 211;
}
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {