Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaae7d97 authored Dec 11, 2012 by Jeff Brown Committed by Android (Google) Code Review Dec 11, 2012

Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev

parents 5def50da 84e2756c

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -4295,6 +4295,13 @@ public final class Settings {
		*/
		public static final String POWER_SOUNDS_ENABLED = "power_sounds_enabled";

		/**
		* URI for the "wireless charging started" sound.
		* @hide
		*/
		public static final String WIRELESS_CHARGING_STARTED_SOUND =
		"wireless_charging_started_sound";

		/**
		* Whether we keep the device on while the device is plugged in.
		* Supported values are:

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -1818,5 +1818,4 @@

		<!-- From PinyinIME(!!!) -->
		<java-symbol type="string" name="inputMethod" />

		</resources>

data/sounds/AudioPackage10.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \
		$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
		$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
		$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \
		$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
		$(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \
		$(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \
		$(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \

data/sounds/effects/ogg/LowBattery.ogg

−5.26 KiB (12.1 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file

data/sounds/effects/ogg/WirelessChargingStarted.ogg

0 → 100644

+11.7 KiB

File added.

No diff preview for this file type.