Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77afd703 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 70555210: am 5793422f: Merge "Add material camera_click sound" into lmp-dev 

* commit '7055521077ea8a18a22451ec0bdb48b96a6c9339':
  Add material camera_click sound
parents ad61c961 c91786ba

data/sounds/AudioPackage10.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \

	$(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \

	$(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \

	$(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \

	$(LOCAL_PATH)/effects/material/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)/effects/material/ogg/LowBattery_48k.ogg:system/media/audio/ui/LowBattery.ogg \

	$(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \

data/sounds/AudioPackage11.mk

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/ogg/KeypressInvalid_48k.ogg:system/media/audio/ui/KeypressInvalid.ogg \

	$(LOCAL_PATH)/effects/ogg/KeypressReturn_48k.ogg:system/media/audio/ui/KeypressReturn.ogg \

	$(LOCAL_PATH)/effects/material/ogg/VideoRecord_48k.ogg:system/media/audio/ui/VideoRecord.ogg \

	$(LOCAL_PATH)/effects/ogg/camera_click_48k.ogg:system/media/audio/ui/camera_click.ogg \

	$(LOCAL_PATH)/effects/material/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)/effects/material/ogg/LowBattery_48k.ogg:system/media/audio/ui/LowBattery.ogg \

	$(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \

data/sounds/AudioPackage12.mk

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 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 \

	camera_click camera_focus Dock Undock Lock Unlock Trusted

MATERIAL_EFFECT_FILES := VideoRecord LowBattery WirelessChargingStarted

	camera_focus Dock Undock Lock Unlock Trusted

MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted



PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\

	$(LOCAL_PATH)/alarms/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)

data/sounds/AudioPackage12_48.mk

+3 −3
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 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 \

	camera_click Lock Unlock Trusted

MATERIAL_EFFECT_FILES := VideoRecord LowBattery WirelessChargingStarted

	Lock Unlock Trusted

MATERIAL_EFFECT_FILES := camera_click VideoRecord LowBattery WirelessChargingStarted



# Alarms not yet available in 48 kHz

PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\

data/sounds/AudioPackage13.mk

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ NOTIFICATION_FILES := Ariel Ceres Carme Elara Europa Iapetus Io Rhea Salacia Tit 
RINGTONE_FILES := Atria Callisto Dione Ganymede Luna Oberon Phobos Pyxis Sedna Titania Triton \

	Umbriel

EFFECT_FILES := Effect_Tick KeypressReturn KeypressInvalid KeypressDelete KeypressSpacebar KeypressStandard \

	camera_click camera_focus Dock Undock Lock Unlock Trusted

MATERIAL_EFFECT_FILES := VideoRecord WirelessChargingStarted LowBattery

	camera_focus Dock Undock Lock Unlock Trusted

MATERIAL_EFFECT_FILES := camera_click VideoRecord WirelessChargingStarted LowBattery



PRODUCT_COPY_FILES += $(foreach fn,$(ALARM_FILES),\

	$(LOCAL_PATH)/alarms/material/ogg/$(fn).ogg:system/media/audio/alarms/$(fn).ogg)