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

Commit 0e9d2af2 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

New user interface sound effects: 

 - Low battery. (http://b/2320026)
 - Dock/undock events.
 - Keyguard lock/unlock events.

New system settings have been created to turn these on/off
and to specify the relevant sound files.

[Production notes: The provided low battery sound and dock
sounds were synthesized; the lock screen sounds are
processed samples of a ballpoint pen click mechanism.]

Bug: 2320026
Change-Id: I374285b0f94f59c7555bb8816580f5a8c802e90d
parent 8fe5571a

core/java/android/provider/Settings.java

+60 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,66 @@ public final class Settings { 
         */

        public static final String POINTER_LOCATION = "pointer_location";



        /**

         * Whether to play a sound for low-battery alerts.

         * @hide

         */

        public static final String POWER_SOUNDS_ENABLED = "power_sounds_enabled";



        /**

         * Whether to play a sound for dock events.

         * @hide

         */

        public static final String DOCK_SOUNDS_ENABLED = "dock_sounds_enabled";



        /**

         * Whether to play sounds when the keyguard is shown and dismissed.

         * @hide

         */

        public static final String LOCKSCREEN_SOUNDS_ENABLED = "lockscreen_sounds_enabled";



        /**

         * URI for the low battery sound file.

         * @hide

         */

        public static final String LOW_BATTERY_SOUND = "low_battery_sound";



        /**

         * URI for the desk dock "in" event sound.

         * @hide

         */

        public static final String DESK_DOCK_SOUND = "desk_dock_sound";



        /**

         * URI for the desk dock "out" event sound.

         * @hide

         */

        public static final String DESK_UNDOCK_SOUND = "desk_undock_sound";



        /**

         * URI for the car dock "in" event sound.

         * @hide

         */

        public static final String CAR_DOCK_SOUND = "car_dock_sound";



        /**

         * URI for the car dock "out" event sound.

         * @hide

         */

        public static final String CAR_UNDOCK_SOUND = "car_undock_sound";



        /**

         * URI for the "device locked" (keyguard shown) sound.

         * @hide

         */

        public static final String LOCK_SOUND = "lock_sound";



        /**

         * URI for the "device unlocked" (keyguard dismissed) sound.

         * @hide

         */

        public static final String UNLOCK_SOUND = "unlock_sound";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.

data/sounds/AudioPackage2.mk

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \

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

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

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

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

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

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

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

	$(LOCAL_PATH)/newwavelabs/CrazyDream.ogg:system/media/audio/ringtones/CrazyDream.ogg \

	$(LOCAL_PATH)/newwavelabs/DreamTheme.ogg:system/media/audio/ringtones/DreamTheme.ogg \

	$(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \

data/sounds/AudioPackage3.mk

+5 −1
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \

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

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

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

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

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

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

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

	$(LOCAL_PATH)/newwavelabs/Big_Easy.ogg:system/media/audio/ringtones/Big_Easy.ogg \

	$(LOCAL_PATH)/newwavelabs/Bollywood.ogg:system/media/audio/ringtones/Bollywood.ogg \

	$(LOCAL_PATH)/newwavelabs/Cairo.ogg:system/media/audio/ringtones/Cairo.ogg \
@@ -89,4 +94,3 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/notifications/pixiedust.ogg:system/media/audio/notifications/pixiedust.ogg \

	$(LOCAL_PATH)/notifications/pizzicato.ogg:system/media/audio/notifications/pizzicato.ogg \

	$(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg

data/sounds/AudioPackage4.mk

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/KeypressReturn.ogg:system/media/audio/ui/KeypressReturn.ogg \

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

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

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

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

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

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

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

	$(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \

	$(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \

	$(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \

data/sounds/effects/Dock.aif

0 → 100644
+43.1 KiB

File added.

No diff preview for this file type.

View file