Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903e8dac authored by Lucas Lin's avatar Lucas Lin Committed by android-build-merger
Browse files

Merge "Create a string for private DNS "On""

am: a64f8d95

Change-Id: I154269dc91acbefdce3cb6f76513d6b4f08f568b
parents ba73db3e a64f8d95
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -2622,6 +2622,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>
+1 −5
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,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);