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

Commit f529cbcd authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Update path to audio files" 

am: 5c47b52b

Change-Id: Iee4977f78ae5b5c17f6dfee198d49aede92012a7
parents 78791cd8 5c47b52b

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -3395,7 +3395,7 @@ 
    <item name="config_inCallNotificationVolume" format="float" type="dimen">.10</item>



    <!-- URI for in call notification sound -->

    <string translatable="false" name="config_inCallNotificationSound">/system/media/audio/ui/InCallNotification.ogg</string>

    <string translatable="false" name="config_inCallNotificationSound">/product/media/audio/ui/InCallNotification.ogg</string>



    <!-- The OEM specified sensor type for the lift trigger to launch the camera app. -->

    <integer name="config_cameraLiftTriggerSensorType">-1</integer>

packages/SettingsProvider/res/values/defaults.xml

+10 −10
Original line number Diff line number Diff line
@@ -68,19 +68,19 @@ 


    <!-- user interface sound effects -->

    <integer name="def_power_sounds_enabled">1</integer>

    <string name="def_low_battery_sound" translatable="false">/system/media/audio/ui/LowBattery.ogg</string>

    <string name="def_low_battery_sound" translatable="false">/product/media/audio/ui/LowBattery.ogg</string>

    <integer name="def_dock_sounds_enabled">0</integer>

    <integer name="def_dock_sounds_enabled_when_accessibility">0</integer>

    <string name="def_desk_dock_sound" translatable="false">/system/media/audio/ui/Dock.ogg</string>

    <string name="def_desk_undock_sound" translatable="false">/system/media/audio/ui/Undock.ogg</string>

    <string name="def_car_dock_sound" translatable="false">/system/media/audio/ui/Dock.ogg</string>

    <string name="def_car_undock_sound" translatable="false">/system/media/audio/ui/Undock.ogg</string>

    <string name="def_desk_dock_sound" translatable="false">/product/media/audio/ui/Dock.ogg</string>

    <string name="def_desk_undock_sound" translatable="false">/product/media/audio/ui/Undock.ogg</string>

    <string name="def_car_dock_sound" translatable="false">/product/media/audio/ui/Dock.ogg</string>

    <string name="def_car_undock_sound" translatable="false">/product/media/audio/ui/Undock.ogg</string>

    <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_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string>

    <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>

    <string name="def_charging_started_sound" translatable="false">/system/media/audio/ui/ChargingStarted.ogg</string>

    <string name="def_lock_sound" translatable="false">/product/media/audio/ui/Lock.ogg</string>

    <string name="def_unlock_sound" translatable="false">/product/media/audio/ui/Unlock.ogg</string>

    <string name="def_trusted_sound" translatable="false">/product/media/audio/ui/Trusted.ogg</string>

    <string name="def_wireless_charging_started_sound" translatable="false">/product/media/audio/ui/WirelessChargingStarted.ogg</string>

    <string name="def_charging_started_sound" translatable="false">/product/media/audio/ui/ChargingStarted.ogg</string>



    <!-- sound trigger detection service default values -->

    <integer name="def_max_sound_trigger_detection_service_ops_per_day" translatable="false">1000</integer>