diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-11-23 17:45:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-23 17:45:57 -0800 |
| commit | f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb (patch) | |
| tree | 6141fbb27b277d8fcea4926ce89440e8636b07a9 | |
| parent | 6a2500a330ef41cbfca40827b60e9f5efdf72db7 (diff) | |
| parent | 9a219519786ce6702c57ec1f1bffe2260fc663a9 (diff) | |
| download | frameworks_base-f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb.zip frameworks_base-f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb.tar.gz frameworks_base-f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb.tar.bz2 | |
am 9a219519: Merge change I2d32301b into eclair
Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2
* commit '9a219519786ce6702c57ec1f1bffe2260fc663a9':
Add 4 new notification sounds.
| -rw-r--r-- | data/sounds/AudioPackage4.mk | 4 | ||||
| -rw-r--r-- | data/sounds/notifications/Cricket.ogg | bin | 0 -> 10936 bytes | |||
| -rw-r--r-- | data/sounds/notifications/Cricket.wav | bin | 0 -> 157524 bytes | |||
| -rw-r--r-- | data/sounds/notifications/Doink.ogg | bin | 0 -> 8911 bytes | |||
| -rw-r--r-- | data/sounds/notifications/Doink.wav | bin | 0 -> 63708 bytes | |||
| -rw-r--r-- | data/sounds/notifications/Drip.ogg | bin | 0 -> 13244 bytes | |||
| -rw-r--r-- | data/sounds/notifications/Drip.wav | bin | 0 -> 218872 bytes | |||
| -rw-r--r-- | data/sounds/notifications/SpaceSeed.ogg | bin | 0 -> 26180 bytes | |||
| -rw-r--r-- | data/sounds/notifications/SpaceSeed.wav | bin | 0 -> 507500 bytes |
9 files changed, 4 insertions, 0 deletions
diff --git a/data/sounds/AudioPackage4.mk b/data/sounds/AudioPackage4.mk index 354002a..6c36bad 100644 --- a/data/sounds/AudioPackage4.mk +++ b/data/sounds/AudioPackage4.mk @@ -20,7 +20,11 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/Alarm_Beep_03.ogg:system/media/audio/alarms/Alarm_Beep_03.ogg \ $(LOCAL_PATH)/Alarm_Rooster_02.ogg:system/media/audio/alarms/Alarm_Rooster_02.ogg \ $(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \ + $(LOCAL_PATH)/notifications/Cricket.ogg:system/media/audio/notifications/Cricket.ogg \ + $(LOCAL_PATH)/notifications/Doink.ogg:system/media/audio/notifications/Doink.ogg \ + $(LOCAL_PATH)/notifications/Drip.ogg:system/media/audio/notifications/Drip.ogg \ $(LOCAL_PATH)/notifications/Heaven.ogg:system/media/audio/notifications/Heaven.ogg \ + $(LOCAL_PATH)/notifications/SpaceSeed.ogg:system/media/audio/notifications/SpaceSeed.ogg \ $(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \ $(LOCAL_PATH)/notifications/Tinkerbell.ogg:system/media/audio/notifications/Tinkerbell.ogg \ $(LOCAL_PATH)/newwavelabs/CaffeineSnake.ogg:system/media/audio/notifications/CaffeineSnake.ogg \ diff --git a/data/sounds/notifications/Cricket.ogg b/data/sounds/notifications/Cricket.ogg Binary files differnew file mode 100644 index 0000000..47b3868 --- /dev/null +++ b/data/sounds/notifications/Cricket.ogg diff --git a/data/sounds/notifications/Cricket.wav b/data/sounds/notifications/Cricket.wav Binary files differnew file mode 100644 index 0000000..0a1d1db --- /dev/null +++ b/data/sounds/notifications/Cricket.wav diff --git a/data/sounds/notifications/Doink.ogg b/data/sounds/notifications/Doink.ogg Binary files differnew file mode 100644 index 0000000..b8b7181 --- /dev/null +++ b/data/sounds/notifications/Doink.ogg diff --git a/data/sounds/notifications/Doink.wav b/data/sounds/notifications/Doink.wav Binary files differnew file mode 100644 index 0000000..b0d37c4 --- /dev/null +++ b/data/sounds/notifications/Doink.wav diff --git a/data/sounds/notifications/Drip.ogg b/data/sounds/notifications/Drip.ogg Binary files differnew file mode 100644 index 0000000..2981758 --- /dev/null +++ b/data/sounds/notifications/Drip.ogg diff --git a/data/sounds/notifications/Drip.wav b/data/sounds/notifications/Drip.wav Binary files differnew file mode 100644 index 0000000..eeb889e --- /dev/null +++ b/data/sounds/notifications/Drip.wav diff --git a/data/sounds/notifications/SpaceSeed.ogg b/data/sounds/notifications/SpaceSeed.ogg Binary files differnew file mode 100644 index 0000000..e69024d --- /dev/null +++ b/data/sounds/notifications/SpaceSeed.ogg diff --git a/data/sounds/notifications/SpaceSeed.wav b/data/sounds/notifications/SpaceSeed.wav Binary files differnew file mode 100644 index 0000000..d209645 --- /dev/null +++ b/data/sounds/notifications/SpaceSeed.wav |