Merge changes I06df032d,Ib923de28
* changes:
Settings: Disable failing tests.
Settings: Fix assertThat in tests
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0b50241..f037eb1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5240,7 +5240,7 @@
<string name="usage_access_title">Apps with usage access</string>
<!-- Sound settings screen, setting check box label -->
- <string name="emergency_tone_title">Emergency tone</string>
+ <string name="emergency_tone_title">Emergency dialing signal</string>
<!-- Sound settings screen, setting option summary text -->
<string name="emergency_tone_summary">Set behavior when an emergency call is placed</string>
@@ -6692,14 +6692,14 @@
<!-- Sound: Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
<string name="dock_audio_media_enabled">Media audio only</string>
- <!-- Sound: Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
- <string name="emergency_tone_silent">Silent</string>
+ <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 0: silence. [CHAR LIMIT=30] -->
+ <string name="emergency_tone_silent">Silence</string>
- <!-- Sound: Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
- <string name="emergency_tone_alert">Alert</string>
+ <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 1: tones. [CHAR LIMIT=30] -->
+ <string name="emergency_tone_alert">Tones</string>
- <!-- Sound: Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
- <string name="emergency_tone_vibrate">Vibrate</string>
+ <!-- Sound: Other sounds: Value for the emergency dialing signal option with value 2: vibrations. [CHAR LIMIT=30] -->
+ <string name="emergency_tone_vibrate">Vibrations</string>
<!-- Sound: Other sounds: Title for the option enabling boot sounds. [CHAR LIMIT=30] -->
<string name="boot_sounds_title">Power on sounds</string>
