From 655900e028888376239a416c5a5283f62141f828 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Fri, 2 Sep 2011 19:46:16 -0700
Subject: [PATCH] Provide help to turn off auto network disable

When a user clicks on an network that is disabled due to poor
connection, add help information to let the user disable the feature

Bug: 5254937
Change-Id: Ia8ddaf9684ae21c9b4c1ab1edba6c941eb5272fd
---
 res/values/strings.xml                                  | 4 ++++
 src/com/android/settings/wifi/WifiConfigController.java | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 207970066e7..474b9b3c710 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1220,6 +1220,10 @@
     <string name="wifi_disabled_generic">Disabled</string>
     <!-- Status for networked disabled from a DNS or DHCP failure -->
     <string name="wifi_disabled_network_failure">Avoided poor internet connection</string>
+    <!-- Heading in the Wi-Fi dialog box when we display a reason for disabling a connection -->
+    <string name="wifi_disabled_heading">Details</string>
+    <!-- Detailed message in Wi-Fi dialog when we disable Wi-Fi due to DNS failure. -->
+    <string name="wifi_disabled_help">Network avoided due to poor connection. You can turn off this behavior of avoiding a network with poor connection in advanced menu of Wi-Fi settings.</string>
     <!-- Status for networks disabled from authentication failure (wrong password
          or certificate). -->
     <string name="wifi_disabled_password_failure">Authentication problem</string>
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2cbe2603243..8d4e77b6e04 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -31,6 +31,7 @@ import android.net.wifi.WifiConfiguration.AuthAlgorithm;
 import android.net.wifi.WifiConfiguration.IpAssignment;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiConfiguration.ProxySettings;
+import android.net.wifi.WifiConfiguration.Status;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WpsConfiguration;
 import android.net.wifi.WpsConfiguration.Setup;
@@ -216,6 +217,13 @@ public class WifiConfigController implements TextWatcher,
                 } else {
                     mProxySettingsSpinner.setSelection(PROXY_NONE);
                 }
+
+                if (config.status == Status.DISABLED &&
+                        config.disableReason == WifiConfiguration.DISABLED_DNS_FAILURE) {
+                    addRow(group, R.string.wifi_disabled_heading,
+                            context.getString(R.string.wifi_disabled_help));
+                }
+
             }
 
             /* Show network setup options only for a new network */