diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk index bf8067ccbd5c2..bb8add1187e76 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 0000000000000..c903a2b0eb975 --- /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 193fd7179f5fb..db20319f6bfcb 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 new file mode 100644 index 0000000000000..e9ee6624b16c9 Binary files /dev/null and b/data/sounds/effects/ogg/NFCFailure.ogg differ diff --git a/data/sounds/effects/ogg/NFCInitiated.ogg b/data/sounds/effects/ogg/NFCInitiated.ogg new file mode 100644 index 0000000000000..a86319faaac74 Binary files /dev/null and b/data/sounds/effects/ogg/NFCInitiated.ogg differ diff --git a/data/sounds/effects/ogg/NFCSuccess.ogg b/data/sounds/effects/ogg/NFCSuccess.ogg new file mode 100644 index 0000000000000..39dfd1f9d8635 Binary files /dev/null and b/data/sounds/effects/ogg/NFCSuccess.ogg differ diff --git a/data/sounds/effects/ogg/NFCTransferComplete.ogg b/data/sounds/effects/ogg/NFCTransferComplete.ogg new file mode 100644 index 0000000000000..f00cd9876effc Binary files /dev/null and b/data/sounds/effects/ogg/NFCTransferComplete.ogg differ diff --git a/data/sounds/effects/ogg/NFCTransferInitiated.ogg b/data/sounds/effects/ogg/NFCTransferInitiated.ogg new file mode 100644 index 0000000000000..7be1bcbe63753 Binary files /dev/null and b/data/sounds/effects/ogg/NFCTransferInitiated.ogg differ