diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-07-10 17:32:11 -0700 |
---|---|---|
committer | Jean-Michel Trivi <jmtrivi@google.com> | 2018-07-10 17:34:42 -0700 |
commit | 72a7c401bd72a9911765bb6ad23d9c4b1cad4831 (patch) | |
tree | 8d1a56dbc33e38563c2d08edb21a31dec4d25e90 /data/sounds | |
parent | b4919259ab3a5caf367ca05798618c6785606182 (diff) |
Audio assets: add NFC sounds
Add audio assets for NFC events.
Add new audio package that includes the NFC sounds in the UI "sound
effects"
Bug: 80405985
Test: use AudioPackage14 in device build, verify NFC sounds are under system/media/audio/ui
Change-Id: Ifdb79286ad4ba083a5515402f8d3e62e0ba61c3f
Diffstat (limited to 'data/sounds')
-rw-r--r-- | data/sounds/AllAudio.mk | 5 | ||||
-rw-r--r-- | data/sounds/AudioPackage14.mk | 32 | ||||
-rw-r--r-- | data/sounds/README.txt | 10 | ||||
-rw-r--r-- | data/sounds/effects/ogg/NFCFailure.ogg | bin | 0 -> 31870 bytes | |||
-rw-r--r-- | data/sounds/effects/ogg/NFCInitiated.ogg | bin | 0 -> 25194 bytes | |||
-rw-r--r-- | data/sounds/effects/ogg/NFCSuccess.ogg | bin | 0 -> 27201 bytes | |||
-rw-r--r-- | data/sounds/effects/ogg/NFCTransferComplete.ogg | bin | 0 -> 33297 bytes | |||
-rw-r--r-- | data/sounds/effects/ogg/NFCTransferInitiated.ogg | bin | 0 -> 28204 bytes |
8 files changed, 47 insertions, 0 deletions
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk index bf8067ccbd5c..bb8add1187e7 100644 --- a/data/sounds/AllAudio.mk +++ b/data/sounds/AllAudio.mk @@ -234,3 +234,8 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \ $(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:system/media/audio/ui/ChargingStarted.ogg \ $(LOCAL_PATH)/effects/ogg/InCallNotification.ogg:system/media/audio/ui/InCallNotification.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCFailure.ogg:system/media/audio/ui/NFCFailure.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCInitiated.ogg:system/media/audio/ui/NFCInitiated.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCSuccess.ogg:system/media/audio/ui/NFCSuccess.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCTransferComplete.ogg:system/media/audio/ui/NFCTransferComplete.ogg \ + $(LOCAL_PATH)/effects/ogg/NFCTransferInitiated.ogg:system/media/audio/ui/NFCTransferInitiated.ogg \ diff --git a/data/sounds/AudioPackage14.mk b/data/sounds/AudioPackage14.mk new file mode 100644 index 000000000000..c903a2b0eb97 --- /dev/null +++ b/data/sounds/AudioPackage14.mk @@ -0,0 +1,32 @@ +# +# Audio Package 14 - P +# +# 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 Timer +NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Titan Tethys +RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \ + Umbriel +EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \ + camera_focus Dock Undock Lock Unlock Trusted ChargingStarted InCallNotification \ + NFCFailure NFCInitiated NFCSuccess NFCTransferComplete NFCTransferInitiated +MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery VideoStop + +PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\ + $(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(NOTIFICATION_FILES),\ + $(LOCAL_PATH)/notifications/material/ogg/$(fn).ogg:system/media/audio/notifications/$(fn).ogg) + +PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ + $(LOCAL_PATH)/ringtones/material/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/ui/$(fn).ogg) +PRODUCT_COPY_FILES += $(foreach fn,$(MATERIAL_EFFECT_FILES),\ + $(LOCAL_PATH)/effects/material/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg) diff --git a/data/sounds/README.txt b/data/sounds/README.txt index 193fd7179f5f..db20319f6bfc 100644 --- a/data/sounds/README.txt +++ b/data/sounds/README.txt @@ -31,3 +31,13 @@ Video recording ./effects/ogg/VideoStop_48k.ogg unused +NFC +--- + +./effects/ogg/NFCFailure.ogg +./effects/ogg/NFCInitiated.ogg +./effects/ogg/NFCSuccess.ogg +./effects/ogg/NFCTransferComplete.ogg +./effects/ogg/NFCTransferInitiated.ogg + +referenced in AudioPackage14.mk (= AudioPackage13.mk + NFC sounds). diff --git a/data/sounds/effects/ogg/NFCFailure.ogg b/data/sounds/effects/ogg/NFCFailure.ogg Binary files differnew file mode 100644 index 000000000000..e9ee6624b16c --- /dev/null +++ b/data/sounds/effects/ogg/NFCFailure.ogg diff --git a/data/sounds/effects/ogg/NFCInitiated.ogg b/data/sounds/effects/ogg/NFCInitiated.ogg Binary files differnew file mode 100644 index 000000000000..a86319faaac7 --- /dev/null +++ b/data/sounds/effects/ogg/NFCInitiated.ogg diff --git a/data/sounds/effects/ogg/NFCSuccess.ogg b/data/sounds/effects/ogg/NFCSuccess.ogg Binary files differnew file mode 100644 index 000000000000..39dfd1f9d863 --- /dev/null +++ b/data/sounds/effects/ogg/NFCSuccess.ogg diff --git a/data/sounds/effects/ogg/NFCTransferComplete.ogg b/data/sounds/effects/ogg/NFCTransferComplete.ogg Binary files differnew file mode 100644 index 000000000000..f00cd9876eff --- /dev/null +++ b/data/sounds/effects/ogg/NFCTransferComplete.ogg diff --git a/data/sounds/effects/ogg/NFCTransferInitiated.ogg b/data/sounds/effects/ogg/NFCTransferInitiated.ogg Binary files differnew file mode 100644 index 000000000000..7be1bcbe6375 --- /dev/null +++ b/data/sounds/effects/ogg/NFCTransferInitiated.ogg |