diff options
| author | Anton Hansson <hansson@google.com> | 2019-05-07 09:46:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-07 09:46:23 +0000 |
| commit | 5c47b52b93bc84521b8caa9e115ab415ed9f86ac (patch) | |
| tree | a971840b14427e39f5082bcb221b4d8a4e4bea67 | |
| parent | 32581e1dd217eda6ab0977e7420dc11a1796fe9d (diff) | |
| parent | 15826082995fb12db1757af122639836c238ec81 (diff) | |
| download | base-5c47b52b93bc84521b8caa9e115ab415ed9f86ac.tar.gz | |
Merge "Update path to audio files"
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f1e9d659e0fd..be492505e230 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index e1a602b53d9d..9536bae6bbe6 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -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> |