Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev

This commit is contained in:
Meng Wang
2016-06-10 16:36:46 +00:00
committed by Android (Google) Code Review
3 changed files with 13 additions and 2 deletions

View File

@@ -1984,6 +1984,7 @@
<!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
<string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\u2019s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>
<string name="emergency_address_title">Update Emergency Address</string>
<string name="emergency_address_summary">Address used by emergency services as your location if you make a 911 call using WiFi</string>
<!-- Sound and alerts settings -->