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

Merge "Update default charging sound to new sound" into pi-dev

Browse Source 
am: 6ee203d632

Change-Id: I150a8fd65ca145db7ddeb2e0a5ae7dd2a267a835
This commit is contained in:
Beverly
2018-03-06 23:16:37 +00:00
committed by android-build-merger
parent e5c12bee08 6ee203d632
commit 07b28ef562
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,7 @@
<string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string> <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
<string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string> <string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string>
<string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string> <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>
<string name="def_charging_started_sound" translatable="false">/system/media/audio/ui/ChargingStarted.ogg</string>
<bool name="def_lockscreen_disabled">false</bool> <bool name="def_lockscreen_disabled">false</bool>
<bool name="def_device_provisioned">false</bool> <bool name="def_device_provisioned">false</bool>

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

@@ -3028,7 +3028,7 @@ public class SettingsProvider extends ContentProvider {
} }
private final class UpgradeController { private final class UpgradeController {
private static final int SETTINGS_VERSION = 155; private static final int SETTINGS_VERSION = 156;
private final int mUserId; private final int mUserId;
@@ -3673,6 +3673,28 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 155; currentVersion = 155;
} }
if (currentVersion == 155) {
// Version 155: Set the default value for CHARGING_STARTED_SOUND.
final SettingsState globalSettings = getGlobalSettingsLocked();
final String oldValue = globalSettings.getSettingLocked(
Global.CHARGING_STARTED_SOUND).getValue();
final String oldDefault = getContext().getResources().getString(
R.string.def_wireless_charging_started_sound);
if (TextUtils.equals(null, oldValue)
|| TextUtils.equals(oldValue, oldDefault)) {
final String defaultValue = getContext().getResources().getString(
R.string.def_charging_started_sound);
if (!TextUtils.isEmpty(defaultValue)) {
globalSettings.insertSettingLocked(
Settings.Global.CHARGING_STARTED_SOUND, defaultValue,
null, true, SettingsState.SYSTEM_PACKAGE_NAME);
}
}
currentVersion = 156;
}
// vXXX: Add new settings above this point. // vXXX: Add new settings above this point.
if (currentVersion != newVersion) { if (currentVersion != newVersion) {