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

Commit ace7404d authored by Jeff Brown's avatar Jeff Brown
Browse files

resolved conflicts for merge of d7337fb9 to master

Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
parents fba73030 d7337fb9
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -4295,6 +4295,13 @@ public final class Settings {
         */
        public static final String POWER_SOUNDS_ENABLED = "power_sounds_enabled";

        /**
         * URI for the "wireless charging started" sound.
         * @hide
         */
        public static final String WIRELESS_CHARGING_STARTED_SOUND =
                "wireless_charging_started_sound";

        /**
         * Whether we keep the device on while the device is plugged in.
         * Supported values are:
+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \
	$(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \
	$(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \
	$(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.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 \
	$(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \
−5.26 KiB (12.1 KiB)

File changed.

No diff preview for this file type.

+11.7 KiB

File added.

No diff preview for this file type.

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@
    <integer name="def_lockscreen_sounds_enabled">1</integer>
    <string name="def_lock_sound" translatable="false">/system/media/audio/ui/Lock.ogg</string>
    <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
    <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>

    <bool name="def_lockscreen_disabled">false</bool>
    <bool name="def_device_provisioned">false</bool>

Loading