PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Create a string for private DNS "On"" am: a64f8d9521

Browse Source 
am: 903e8dac6c

Change-Id: Id364ce04a54afe3abe8e9b240a6a6ed9864d5681
This commit is contained in:
Lucas Lin
2019-07-23 20:56:43 -07:00
committed by android-build-merger
parent 920f6109a8 903e8dac6c
commit c30cdecfba
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/PrivateDnsPreferenceController.java
View File

@@ -126,11 +126,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