summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhisek Devkota <ciwrl@cyanogenmod.com>2015-12-15 15:39:32 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-12-22 08:38:53 -0800
commit92a8a5051c7a7035309ba1811f47aacdf6fc9fd5 (patch)
tree871d6de20078a5c2e9e322ad3841ca1ae41ad2aa
parent2b807b69b855626fcdc71fffac2fc81d19a885b3 (diff)
downloadframeworks_base-92a8a5051c7a7035309ba1811f47aacdf6fc9fd5.zip
frameworks_base-92a8a5051c7a7035309ba1811f47aacdf6fc9fd5.tar.gz
frameworks_base-92a8a5051c7a7035309ba1811f47aacdf6fc9fd5.tar.bz2
Add custom camera shutter
SAMBAR-1185 Change-Id: I71ca056813005ea7b17213fa8a47061de6192aa7
-rw-r--r--data/sounds/AllAudio.mk9
-rw-r--r--data/sounds/effects/boosted/Roachpowder_camera-shutter.aiffbin0 -> 26734 bytes
2 files changed, 8 insertions, 1 deletions
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk
index c612902..ae3e8d1 100644
--- a/data/sounds/AllAudio.mk
+++ b/data/sounds/AllAudio.mk
@@ -327,7 +327,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/effects/ogg/Trusted_48k.ogg:system/media/audio/ui/Trusted.ogg \
$(LOCAL_PATH)/effects/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \
$(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \
- $(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \
$(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \
$(LOCAL_PATH)/notifications/material/ogg/Ariel.ogg:system/media/audio/notifications/Ariel.ogg \
$(LOCAL_PATH)/notifications/material/ogg/Carme.ogg:system/media/audio/notifications/Carme.ogg \
@@ -340,3 +339,11 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/notifications/material/ogg/Salacia.ogg:system/media/audio/notifications/Salacia.ogg \
$(LOCAL_PATH)/notifications/material/ogg/Tethys.ogg:system/media/audio/notifications/Tethys.ogg \
$(LOCAL_PATH)/notifications/material/ogg/Titan.ogg:system/media/audio/notifications/Titan.ogg
+
+ifeq ($(TARGET_NEEDS_BOOSTED_SOUNDS),true)
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/effects/boosted/Roachpowder_camera-shutter.aiff:system/media/audio/ui/camera_click.ogg
+else
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg
+endif
diff --git a/data/sounds/effects/boosted/Roachpowder_camera-shutter.aiff b/data/sounds/effects/boosted/Roachpowder_camera-shutter.aiff
new file mode 100644
index 0000000..e0534ed
--- /dev/null
+++ b/data/sounds/effects/boosted/Roachpowder_camera-shutter.aiff
Binary files differ