Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add settings default handling for STATUS_BAR_SHOW_VIBRATE_ICON" am: 234f6fca5b am: 9ac600db5a am: 1d270f7a7f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2257564

Change-Id: I0081734838877a94b24c277cdd1ab54384af3537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2022-10-20 17:59:30 +00:00
committed by Automerger Merge Worker
parent 59b364235f 1d270f7a7f
commit f6ffe907b1
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -311,4 +311,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>

14
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -3659,7 +3659,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;
@@ -5531,7 +5531,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) {