diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-09-13 11:16:13 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2013-09-18 23:09:58 -0400 |
| commit | dcbdd3b420254ce39d9793c6fde6dd05436704ff (patch) | |
| tree | f3ccad6bfd8d702971b670682b85a8e0355d961f /data/sounds | |
| parent | 138685d9db005cbd62ede45eb066a2e672db9588 (diff) | |
New sounds for K.
AudioPackage12 uses the new sounds (specifically the default
versions at 44.1kHz); device-specific makefiles can elect to
use the 48k versions instead by including
AudioPackage12_48.mk.
Bug: 9454760
Change-Id: If714fc4b98f6700163f08c92a6376f28f9616382
Diffstat (limited to 'data/sounds')
59 files changed, 63 insertions, 0 deletions
diff --git a/data/sounds/AudioPackage12.mk b/data/sounds/AudioPackage12.mk new file mode 100644 index 000000000000..8cf94941fd3d --- /dev/null +++ b/data/sounds/AudioPackage12.mk @@ -0,0 +1,27 @@ +# +# Audio Package 12 - K +# +# Include this file in a product makefile to include these audio files +# +# + +LOCAL_PATH := frameworks/base/data/sounds + +# Simple files that do not require renaming +ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum +NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys +RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel +EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \ + VideoRecord camera_click camera_focus LowBattery Dock Undock Lock Unlock WirelessChargingStarted + +PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ + $(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ + $(LOCAL_PATH)/notifications/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ + $(LOCAL_PATH)/ringtones/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ + $(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/effects/$(fn).ogg) diff --git a/data/sounds/AudioPackage12_48.mk b/data/sounds/AudioPackage12_48.mk new file mode 100644 index 000000000000..6b7b796b2370 --- /dev/null +++ b/data/sounds/AudioPackage12_48.mk @@ -0,0 +1,36 @@ +# +# Audio Package 12 - K (48kHz) +# +# Include this file in a product makefile to include these audio files +# +# + +LOCAL_PATH := frameworks/base/data/sounds + +# Simple files that do not require renaming +ALARM_FILES := Argon Carbon Helium Krypton Neon Oxygen Osmium Platinum +NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys +RINGTONE_FILES := Callisto Dione Ganymede Luna Oberon Phobos Sedna Titania Triton Umbriel +EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \ + VideoRecord camera_click Lock Unlock + +# Alarms not yet available in 48 kHz +PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ + $(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ + $(LOCAL_PATH)/notifications/ogg/$(fn)_48k.ogg:system/media/audio/notifications/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ + $(LOCAL_PATH)/ringtones/ogg/$(fn)_48k.ogg:system/media/audio/ringtones/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\ + $(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:system/media/audio/effects/$(fn).ogg) + +# no gold-plated version yet +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/effects/camera_focus.ogg \ + $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/effects/LowBattery.ogg \ + $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/effects/WirelessChargingStarted.ogg \ + $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/effects/Dock.ogg \ + $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/effects/Undock.ogg diff --git a/data/sounds/effects/ogg/Effect_Tick.ogg b/data/sounds/effects/ogg/Effect_Tick.ogg Binary files differindex c8a5c36e9550..42dddb157b97 100644 --- a/data/sounds/effects/ogg/Effect_Tick.ogg +++ b/data/sounds/effects/ogg/Effect_Tick.ogg diff --git a/data/sounds/effects/ogg/Effect_Tick_48k.ogg b/data/sounds/effects/ogg/Effect_Tick_48k.ogg Binary files differindex e1f53d7a3e6c..eb1847ea5cb0 100644 --- a/data/sounds/effects/ogg/Effect_Tick_48k.ogg +++ b/data/sounds/effects/ogg/Effect_Tick_48k.ogg diff --git a/data/sounds/effects/ogg/KeypressDelete.ogg b/data/sounds/effects/ogg/KeypressDelete.ogg Binary files differindex 38c3244b0d12..cf2dce3d5daa 100644 --- a/data/sounds/effects/ogg/KeypressDelete.ogg +++ b/data/sounds/effects/ogg/KeypressDelete.ogg diff --git a/data/sounds/effects/ogg/KeypressDelete_48k.ogg b/data/sounds/effects/ogg/KeypressDelete_48k.ogg Binary files differnew file mode 100644 index 000000000000..9b33f5309e61 --- /dev/null +++ b/data/sounds/effects/ogg/KeypressDelete_48k.ogg diff --git a/data/sounds/effects/ogg/KeypressInvalid_48k.ogg b/data/sounds/effects/ogg/KeypressInvalid_48k.ogg Binary files differnew file mode 100644 index 000000000000..24935ad2e3ba --- /dev/null +++ b/data/sounds/effects/ogg/KeypressInvalid_48k.ogg diff --git a/data/sounds/effects/ogg/KeypressReturn.ogg b/data/sounds/effects/ogg/KeypressReturn.ogg Binary files differindex 1bd5b7358b8e..314ed85e5fbf 100644 --- a/data/sounds/effects/ogg/KeypressReturn.ogg +++ b/data/sounds/effects/ogg/KeypressReturn.ogg diff --git a/data/sounds/effects/ogg/KeypressReturn_48k.ogg b/data/sounds/effects/ogg/KeypressReturn_48k.ogg Binary files differnew file mode 100644 index 000000000000..04627fcd4f4c --- /dev/null +++ b/data/sounds/effects/ogg/KeypressReturn_48k.ogg diff --git a/data/sounds/effects/ogg/KeypressSpacebar.ogg b/data/sounds/effects/ogg/KeypressSpacebar.ogg Binary files differindex 3a835949a8a5..6aca94a1fd6c 100644 --- a/data/sounds/effects/ogg/KeypressSpacebar.ogg +++ b/data/sounds/effects/ogg/KeypressSpacebar.ogg diff --git a/data/sounds/effects/ogg/KeypressSpacebar_48k.ogg b/data/sounds/effects/ogg/KeypressSpacebar_48k.ogg Binary files differnew file mode 100644 index 000000000000..9953e56726bc --- /dev/null +++ b/data/sounds/effects/ogg/KeypressSpacebar_48k.ogg diff --git a/data/sounds/effects/ogg/KeypressStandard.ogg b/data/sounds/effects/ogg/KeypressStandard.ogg Binary files differindex 4b8d128b00e1..9b9747cfd6cb 100644 --- a/data/sounds/effects/ogg/KeypressStandard.ogg +++ b/data/sounds/effects/ogg/KeypressStandard.ogg diff --git a/data/sounds/effects/ogg/KeypressStandard_48k.ogg b/data/sounds/effects/ogg/KeypressStandard_48k.ogg Binary files differnew file mode 100644 index 000000000000..3f57438a15a5 --- /dev/null +++ b/data/sounds/effects/ogg/KeypressStandard_48k.ogg diff --git a/data/sounds/effects/ogg/Lock.ogg b/data/sounds/effects/ogg/Lock.ogg Binary files differindex e7928e493f40..7e989114b910 100644 --- a/data/sounds/effects/ogg/Lock.ogg +++ b/data/sounds/effects/ogg/Lock.ogg diff --git a/data/sounds/effects/ogg/Lock_48k.ogg b/data/sounds/effects/ogg/Lock_48k.ogg Binary files differnew file mode 100644 index 000000000000..06697ed72c8f --- /dev/null +++ b/data/sounds/effects/ogg/Lock_48k.ogg diff --git a/data/sounds/effects/ogg/Unlock.ogg b/data/sounds/effects/ogg/Unlock.ogg Binary files differindex cca95940d950..851eed5063ff 100644 --- a/data/sounds/effects/ogg/Unlock.ogg +++ b/data/sounds/effects/ogg/Unlock.ogg diff --git a/data/sounds/effects/ogg/Unlock_48k.ogg b/data/sounds/effects/ogg/Unlock_48k.ogg Binary files differnew file mode 100644 index 000000000000..c2cf304948c7 --- /dev/null +++ b/data/sounds/effects/ogg/Unlock_48k.ogg diff --git a/data/sounds/notifications/ogg/Ariel.ogg b/data/sounds/notifications/ogg/Ariel.ogg Binary files differnew file mode 100644 index 000000000000..6a11cbd7f9e8 --- /dev/null +++ b/data/sounds/notifications/ogg/Ariel.ogg diff --git a/data/sounds/notifications/ogg/Ariel_48k.ogg b/data/sounds/notifications/ogg/Ariel_48k.ogg Binary files differnew file mode 100644 index 000000000000..6a11cbd7f9e8 --- /dev/null +++ b/data/sounds/notifications/ogg/Ariel_48k.ogg diff --git a/data/sounds/notifications/ogg/Carme.ogg b/data/sounds/notifications/ogg/Carme.ogg Binary files differnew file mode 100644 index 000000000000..afd358fd76f9 --- /dev/null +++ b/data/sounds/notifications/ogg/Carme.ogg diff --git a/data/sounds/notifications/ogg/Carme_48k.ogg b/data/sounds/notifications/ogg/Carme_48k.ogg Binary files differnew file mode 100644 index 000000000000..1dd4b417251f --- /dev/null +++ b/data/sounds/notifications/ogg/Carme_48k.ogg diff --git a/data/sounds/notifications/ogg/Ceres.ogg b/data/sounds/notifications/ogg/Ceres.ogg Binary files differnew file mode 100644 index 000000000000..fadbe84165b5 --- /dev/null +++ b/data/sounds/notifications/ogg/Ceres.ogg diff --git a/data/sounds/notifications/ogg/Ceres_48k.ogg b/data/sounds/notifications/ogg/Ceres_48k.ogg Binary files differnew file mode 100644 index 000000000000..134842d70bbe --- /dev/null +++ b/data/sounds/notifications/ogg/Ceres_48k.ogg diff --git a/data/sounds/notifications/ogg/Elara.ogg b/data/sounds/notifications/ogg/Elara.ogg Binary files differnew file mode 100644 index 000000000000..c66c9f333b4e --- /dev/null +++ b/data/sounds/notifications/ogg/Elara.ogg diff --git a/data/sounds/notifications/ogg/Elara_48k.ogg b/data/sounds/notifications/ogg/Elara_48k.ogg Binary files differnew file mode 100644 index 000000000000..80c619554df3 --- /dev/null +++ b/data/sounds/notifications/ogg/Elara_48k.ogg diff --git a/data/sounds/notifications/ogg/Europa.ogg b/data/sounds/notifications/ogg/Europa.ogg Binary files differnew file mode 100644 index 000000000000..07cc3d94544e --- /dev/null +++ b/data/sounds/notifications/ogg/Europa.ogg diff --git a/data/sounds/notifications/ogg/Europa_48k.ogg b/data/sounds/notifications/ogg/Europa_48k.ogg Binary files differnew file mode 100644 index 000000000000..bf27eb146cab --- /dev/null +++ b/data/sounds/notifications/ogg/Europa_48k.ogg diff --git a/data/sounds/notifications/ogg/Iapetus.ogg b/data/sounds/notifications/ogg/Iapetus.ogg Binary files differnew file mode 100644 index 000000000000..d4062a8431a6 --- /dev/null +++ b/data/sounds/notifications/ogg/Iapetus.ogg diff --git a/data/sounds/notifications/ogg/Iapetus_48k.ogg b/data/sounds/notifications/ogg/Iapetus_48k.ogg Binary files differnew file mode 100644 index 000000000000..811523962b6f --- /dev/null +++ b/data/sounds/notifications/ogg/Iapetus_48k.ogg diff --git a/data/sounds/notifications/ogg/Io.ogg b/data/sounds/notifications/ogg/Io.ogg Binary files differnew file mode 100644 index 000000000000..2286d7373866 --- /dev/null +++ b/data/sounds/notifications/ogg/Io.ogg diff --git a/data/sounds/notifications/ogg/Io_48k.ogg b/data/sounds/notifications/ogg/Io_48k.ogg Binary files differnew file mode 100644 index 000000000000..2286d7373866 --- /dev/null +++ b/data/sounds/notifications/ogg/Io_48k.ogg diff --git a/data/sounds/notifications/ogg/Rhea.ogg b/data/sounds/notifications/ogg/Rhea.ogg Binary files differnew file mode 100644 index 000000000000..039644f942e7 --- /dev/null +++ b/data/sounds/notifications/ogg/Rhea.ogg diff --git a/data/sounds/notifications/ogg/Rhea_48k.ogg b/data/sounds/notifications/ogg/Rhea_48k.ogg Binary files differnew file mode 100644 index 000000000000..32889f3c863f --- /dev/null +++ b/data/sounds/notifications/ogg/Rhea_48k.ogg diff --git a/data/sounds/notifications/ogg/Salacia.ogg b/data/sounds/notifications/ogg/Salacia.ogg Binary files differnew file mode 100644 index 000000000000..af07b01fceaa --- /dev/null +++ b/data/sounds/notifications/ogg/Salacia.ogg diff --git a/data/sounds/notifications/ogg/Salacia_48k.ogg b/data/sounds/notifications/ogg/Salacia_48k.ogg Binary files differnew file mode 100644 index 000000000000..3ef7b0ba3f5e --- /dev/null +++ b/data/sounds/notifications/ogg/Salacia_48k.ogg diff --git a/data/sounds/notifications/ogg/Tethys.ogg b/data/sounds/notifications/ogg/Tethys.ogg Binary files differnew file mode 100644 index 000000000000..25475d108aa2 --- /dev/null +++ b/data/sounds/notifications/ogg/Tethys.ogg diff --git a/data/sounds/notifications/ogg/Tethys_48k.ogg b/data/sounds/notifications/ogg/Tethys_48k.ogg Binary files differnew file mode 100644 index 000000000000..a9d8bbd7a6bf --- /dev/null +++ b/data/sounds/notifications/ogg/Tethys_48k.ogg diff --git a/data/sounds/notifications/ogg/Titan.ogg b/data/sounds/notifications/ogg/Titan.ogg Binary files differnew file mode 100644 index 000000000000..8c10f58c8141 --- /dev/null +++ b/data/sounds/notifications/ogg/Titan.ogg diff --git a/data/sounds/notifications/ogg/Titan_48k.ogg b/data/sounds/notifications/ogg/Titan_48k.ogg Binary files differnew file mode 100644 index 000000000000..45ea524a9578 --- /dev/null +++ b/data/sounds/notifications/ogg/Titan_48k.ogg diff --git a/data/sounds/ringtones/ogg/Callisto.ogg b/data/sounds/ringtones/ogg/Callisto.ogg Binary files differnew file mode 100644 index 000000000000..9c982d80752b --- /dev/null +++ b/data/sounds/ringtones/ogg/Callisto.ogg diff --git a/data/sounds/ringtones/ogg/Callisto_48k.ogg b/data/sounds/ringtones/ogg/Callisto_48k.ogg Binary files differnew file mode 100644 index 000000000000..05ad67b3cdc6 --- /dev/null +++ b/data/sounds/ringtones/ogg/Callisto_48k.ogg diff --git a/data/sounds/ringtones/ogg/Dione.ogg b/data/sounds/ringtones/ogg/Dione.ogg Binary files differnew file mode 100644 index 000000000000..a378520f588f --- /dev/null +++ b/data/sounds/ringtones/ogg/Dione.ogg diff --git a/data/sounds/ringtones/ogg/Dione_48k.ogg b/data/sounds/ringtones/ogg/Dione_48k.ogg Binary files differnew file mode 100644 index 000000000000..a378520f588f --- /dev/null +++ b/data/sounds/ringtones/ogg/Dione_48k.ogg diff --git a/data/sounds/ringtones/ogg/Ganymede.ogg b/data/sounds/ringtones/ogg/Ganymede.ogg Binary files differnew file mode 100644 index 000000000000..01ff573aef54 --- /dev/null +++ b/data/sounds/ringtones/ogg/Ganymede.ogg diff --git a/data/sounds/ringtones/ogg/Ganymede_48k.ogg b/data/sounds/ringtones/ogg/Ganymede_48k.ogg Binary files differnew file mode 100644 index 000000000000..aed2e967e6dc --- /dev/null +++ b/data/sounds/ringtones/ogg/Ganymede_48k.ogg diff --git a/data/sounds/ringtones/ogg/Luna.ogg b/data/sounds/ringtones/ogg/Luna.ogg Binary files differnew file mode 100644 index 000000000000..87a2463902ea --- /dev/null +++ b/data/sounds/ringtones/ogg/Luna.ogg diff --git a/data/sounds/ringtones/ogg/Luna_48k.ogg b/data/sounds/ringtones/ogg/Luna_48k.ogg Binary files differnew file mode 100644 index 000000000000..c8a61aab41d5 --- /dev/null +++ b/data/sounds/ringtones/ogg/Luna_48k.ogg diff --git a/data/sounds/ringtones/ogg/Oberon.ogg b/data/sounds/ringtones/ogg/Oberon.ogg Binary files differnew file mode 100644 index 000000000000..124af10019d9 --- /dev/null +++ b/data/sounds/ringtones/ogg/Oberon.ogg diff --git a/data/sounds/ringtones/ogg/Oberon_48k.ogg b/data/sounds/ringtones/ogg/Oberon_48k.ogg Binary files differnew file mode 100644 index 000000000000..ec2cb29cfaa5 --- /dev/null +++ b/data/sounds/ringtones/ogg/Oberon_48k.ogg diff --git a/data/sounds/ringtones/ogg/Phobos.ogg b/data/sounds/ringtones/ogg/Phobos.ogg Binary files differnew file mode 100644 index 000000000000..768ca9498f41 --- /dev/null +++ b/data/sounds/ringtones/ogg/Phobos.ogg diff --git a/data/sounds/ringtones/ogg/Phobos_48k.ogg b/data/sounds/ringtones/ogg/Phobos_48k.ogg Binary files differnew file mode 100644 index 000000000000..f926cb0eb7da --- /dev/null +++ b/data/sounds/ringtones/ogg/Phobos_48k.ogg diff --git a/data/sounds/ringtones/ogg/Sedna.ogg b/data/sounds/ringtones/ogg/Sedna.ogg Binary files differnew file mode 100644 index 000000000000..522faaf7ce27 --- /dev/null +++ b/data/sounds/ringtones/ogg/Sedna.ogg diff --git a/data/sounds/ringtones/ogg/Sedna_48k.ogg b/data/sounds/ringtones/ogg/Sedna_48k.ogg Binary files differnew file mode 100644 index 000000000000..522faaf7ce27 --- /dev/null +++ b/data/sounds/ringtones/ogg/Sedna_48k.ogg diff --git a/data/sounds/ringtones/ogg/Titania.ogg b/data/sounds/ringtones/ogg/Titania.ogg Binary files differnew file mode 100644 index 000000000000..76cc0a5d1894 --- /dev/null +++ b/data/sounds/ringtones/ogg/Titania.ogg diff --git a/data/sounds/ringtones/ogg/Titania_48k.ogg b/data/sounds/ringtones/ogg/Titania_48k.ogg Binary files differnew file mode 100644 index 000000000000..4da66367251f --- /dev/null +++ b/data/sounds/ringtones/ogg/Titania_48k.ogg diff --git a/data/sounds/ringtones/ogg/Triton.ogg b/data/sounds/ringtones/ogg/Triton.ogg Binary files differnew file mode 100644 index 000000000000..542ae1624e00 --- /dev/null +++ b/data/sounds/ringtones/ogg/Triton.ogg diff --git a/data/sounds/ringtones/ogg/Triton_48k.ogg b/data/sounds/ringtones/ogg/Triton_48k.ogg Binary files differnew file mode 100644 index 000000000000..0ae7383455bb --- /dev/null +++ b/data/sounds/ringtones/ogg/Triton_48k.ogg diff --git a/data/sounds/ringtones/ogg/Umbriel.ogg b/data/sounds/ringtones/ogg/Umbriel.ogg Binary files differnew file mode 100644 index 000000000000..b21a12e0778a --- /dev/null +++ b/data/sounds/ringtones/ogg/Umbriel.ogg diff --git a/data/sounds/ringtones/ogg/Umbriel_48k.ogg b/data/sounds/ringtones/ogg/Umbriel_48k.ogg Binary files differnew file mode 100644 index 000000000000..99ebcddae6b0 --- /dev/null +++ b/data/sounds/ringtones/ogg/Umbriel_48k.ogg |