From 2059abd84b779fbfc0d13dfc628d85645202308b Mon Sep 17 00:00:00 2001
From: Weng Su <wengsu@google.com>
Date: Tue, 29 Sep 2020 21:41:55 +0800
Subject: [PATCH] Add DNS warning message

When private DNS (DNS over TLS) is active,
that setting a DNS for a static IP configuration will have no effect.

Add DNS warning message as below screenshot.
https://screenshot.googleplex.com/8JHK328tX6HxrYZ

Bug: 157620236
Test: Manual verify by WiFi Settings UI
Change-Id: Ibed34ceda32670f481d84b85b431d855af478dc3
---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f958e06cb13..e23843f7b05 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2305,9 +2305,9 @@
     <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
     <string name="wifi_ip_settings_invalid_network_prefix_length">Type a network prefix length between 0 and 32.</string>
     <!-- Label for the DNS (first one) -->
-    <string name="wifi_dns1">DNS 1</string>
+    <string name="wifi_dns1">DNS 1 (unless overridden by Private DNS)</string>
     <!-- Label for the DNS (second one)-->
-    <string name="wifi_dns2">DNS 2</string>
+    <string name="wifi_dns2">DNS 2 (unless overridden by Private DNS)</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
     <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->