summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-09-02 19:46:16 -0700
committerIrfan Sheriff <isheriff@google.com>2011-09-06 09:35:23 -0700
commit655900e028888376239a416c5a5283f62141f828 (patch)
tree75bee1a77ebc7c279eb82747d9fa39137e3cdb41 /src/com/android/settings/wifi
parente964d57152a503b6337fef145913ca17d5eff1b4 (diff)
downloadpackages_apps_Settings-655900e028888376239a416c5a5283f62141f828.zip
packages_apps_Settings-655900e028888376239a416c5a5283f62141f828.tar.gz
packages_apps_Settings-655900e028888376239a416c5a5283f62141f828.tar.bz2
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
Diffstat (limited to 'src/com/android/settings/wifi')
-rw-r--r--src/com/android/settings/wifi/WifiConfigController.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 2cbe260..8d4e77b 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 */