summaryrefslogtreecommitdiffstats
path: root/data/sounds
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-12-11 14:19:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-11 14:19:41 -0800
commitd7337fb97aab0b28c6ca60f6553d03feb1000991 (patch)
treed07afd7096bc1d314b9b5c86d387c9468eb54cb2 /data/sounds
parent5ccefdd6d570a084ce708d7f4654358ef7108451 (diff)
parent3781523becbb2d576761c2701763ff3588294a97 (diff)
downloadframeworks_base-d7337fb97aab0b28c6ca60f6553d03feb1000991.zip
frameworks_base-d7337fb97aab0b28c6ca60f6553d03feb1000991.tar.gz
frameworks_base-d7337fb97aab0b28c6ca60f6553d03feb1000991.tar.bz2
am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
* commit '3781523becbb2d576761c2701763ff3588294a97': Play a tone when wireless charging begins.
Diffstat (limited to 'data/sounds')
-rwxr-xr-xdata/sounds/AudioPackage10.mk1
-rw-r--r--data/sounds/effects/ogg/LowBattery.oggbin17786 -> 12401 bytes
-rw-r--r--data/sounds/effects/ogg/WirelessChargingStarted.oggbin0 -> 12025 bytes
3 files changed, 1 insertions, 0 deletions
diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk
index cb55bba..b40e385 100755
--- a/data/sounds/AudioPackage10.mk
+++ b/data/sounds/AudioPackage10.mk
@@ -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 \
diff --git a/data/sounds/effects/ogg/LowBattery.ogg b/data/sounds/effects/ogg/LowBattery.ogg
index 710e385..ab9eba3 100644
--- a/data/sounds/effects/ogg/LowBattery.ogg
+++ b/data/sounds/effects/ogg/LowBattery.ogg
Binary files differ
diff --git a/data/sounds/effects/ogg/WirelessChargingStarted.ogg b/data/sounds/effects/ogg/WirelessChargingStarted.ogg
new file mode 100644
index 0000000..66f6cd2
--- /dev/null
+++ b/data/sounds/effects/ogg/WirelessChargingStarted.ogg
Binary files differ