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

am 3fa46d4e: am c2ec3340: Merge "Add setting to mute wireless charging sound." into mnc-dev

Browse Source 
* commit '3fa46d4e13f21d982db63402ad89f5fe0ce6cc36':
  Add setting to mute wireless charging sound.
This commit is contained in:
John Spurlock
2015-05-07 05:27:21 +00:00
committed by Android Git Automerger
parent 6465d96902 3fa46d4e13
commit b5eeb1cec3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/Settings.java
View File

@@ -5950,6 +5950,12 @@ public final class Settings {
public static final String WIRELESS_CHARGING_STARTED_SOUND = public static final String WIRELESS_CHARGING_STARTED_SOUND =
"wireless_charging_started_sound"; "wireless_charging_started_sound";
/**
* Whether to play a sound for charging events.
* @hide
*/
public static final String CHARGING_SOUNDS_ENABLED = "charging_sounds_enabled";
/** /**
* Whether we keep the device on while the device is plugged in. * Whether we keep the device on while the device is plugged in.
* Supported values are: * Supported values are:

4
services/core/java/com/android/server/power/Notifier.java
View File

@@ -539,9 +539,11 @@ final class Notifier {
}; };
private void playWirelessChargingStartedSound() { private void playWirelessChargingStartedSound() {
final boolean enabled = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.CHARGING_SOUNDS_ENABLED, 1) != 0;
final String soundPath = Settings.Global.getString(mContext.getContentResolver(), final String soundPath = Settings.Global.getString(mContext.getContentResolver(),
Settings.Global.WIRELESS_CHARGING_STARTED_SOUND); Settings.Global.WIRELESS_CHARGING_STARTED_SOUND);
if (soundPath != null) { if (enabled && soundPath != null) {
final Uri soundUri = Uri.parse("file://" + soundPath); final Uri soundUri = Uri.parse("file://" + soundPath);
if (soundUri != null) { if (soundUri != null) {
final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri); final Ringtone sfx = RingtoneManager.getRingtone(mContext, soundUri);