Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev

This commit is contained in:
Naina Nalluri
2018-05-14 22:59:11 +00:00
committed by Android (Google) Code Review
7 changed files with 725 additions and 7 deletions

View File

@@ -2340,6 +2340,17 @@
<!-- Message of private dns that provides a help link. [CHAR LIMIT=NONE] -->
<string name="private_dns_help_message"><annotation id="url">Learn more</annotation> about Private DNS features</string>
<!-- Message to display when setting wifi calling are not editable [CHAR LIMIT=NONE] -->
<string name="wifi_calling_pref_managed_by_carrier">Setting managed by carrier</string>
<!-- Message to display when wifi calling needs activation [CHAR LIMIT=NONE] -->
<string name="wifi_calling_settings_activation_instructions">Activate Wi\u2011Fi Calling</string>
<!-- Message to display when wifi calling should be on [CHAR LIMIT=NONE] -->
<string name="wifi_calling_turn_on">Turn on Wi\u2011Fi calling</string>
<!-- Message to display when carrier does not support wifi calling or doesn't want the user
to modify the settings [CHAR LIMIT=NONE] -->
<string name="wifi_calling_not_supported">Wi\u2011Fi calling is not supported for %1$s</string>
<!-- Carrier string to use in other messages -->
<string name="carrier">Carrier</string>
<!-- Sound and alerts settings -->
<skip/>
<string name="display_settings_title">Display</string>