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

Commit 49e057d7 authored by Adrian Roos's avatar Adrian Roos
Browse files

Play "device trusted" sound when onTrustInitiatedByUser fires 

Bug: 16840500
Change-Id: I73fbe5c2cff665ccb637abb9039d57f377d9df53
parent 9eee9dca

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -5131,6 +5131,13 @@ public final class Settings { 
         */

        public static final String UNLOCK_SOUND = "unlock_sound";



        /**

         * URI for the "device is trusted" sound, which is played when the device enters the trusted

         * state without unlocking.

         * @hide

         */

        public static final String TRUSTED_SOUND = "trusted_sound";



        /**

         * URI for the low battery sound file.

         * @hide

data/sounds/AllAudio.mk

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ PRODUCT_COPY_FILES += \ 
    $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \

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

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

    $(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 \

data/sounds/AudioPackage10.mk

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \

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

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

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

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

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

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

data/sounds/AudioPackage11.mk

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ PRODUCT_COPY_FILES += \ 
	$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \

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

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

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

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

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

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

data/sounds/AudioPackage12.mk

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

	VideoRecord camera_click camera_focus LowBattery Dock Undock Lock Unlock WirelessChargingStarted

	VideoRecord camera_click camera_focus LowBattery Dock Undock Lock Unlock WirelessChargingStarted \

	Trusted



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

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