diff options
3 files changed, 4 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 578c643629..0e3fbd8eee 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2362,6 +2362,8 @@ <string name="emergency_address_summary">Used as your location when you make an emergency call over Wi\u2011Fi</string> <!-- 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 private dns is on. [CHAR LIMIT=10] --> + <string name="private_dns_mode_on">On</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> diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 13e5bf342d..67f300c0ce 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -119,11 +119,7 @@ public class PrivateDnsPreferenceController extends BasePreferenceController case PRIVATE_DNS_MODE_OFF: return res.getString(R.string.private_dns_mode_off); case PRIVATE_DNS_MODE_OPPORTUNISTIC: - // TODO (b/79122154) : create a string specifically for this, instead of - // hijacking a string from notifications. This is necessary at this time - // because string freeze is in the past and this string has the right - // content at this moment. - return dnsesResolved ? res.getString(R.string.switch_on_text) + return dnsesResolved ? res.getString(R.string.private_dns_mode_on) : res.getString(R.string.private_dns_mode_opportunistic); case PRIVATE_DNS_MODE_PROVIDER_HOSTNAME: return dnsesResolved diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index eff20d3485..39df7176d1 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -186,7 +186,7 @@ public class PrivateDnsPreferenceControllerTest { when(lp.getValidatedPrivateDnsServers()).thenReturn(NON_EMPTY_ADDRESS_LIST); updateLinkProperties(lp); mController.updateState(mPreference); - verify(mPreference).setSummary(getResourceString(R.string.switch_on_text)); + verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_on)); reset(mPreference); lp = mock(LinkProperties.class); |