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

Provide help to turn off auto network disable

Browse Source 
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
This commit is contained in:
Irfan Sheriff
2011-09-02 19:46:16 -07:00
parent e964d57152
commit 655900e028
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1220,6 +1220,10 @@
<string name="wifi_disabled_generic">Disabled</string> <string name="wifi_disabled_generic">Disabled</string>
<!-- Status for networked disabled from a DNS or DHCP failure --> <!-- Status for networked disabled from a DNS or DHCP failure -->
<string name="wifi_disabled_network_failure">Avoided poor internet connection</string> <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 <!-- Status for networks disabled from authentication failure (wrong password
or certificate). --> or certificate). -->
<string name="wifi_disabled_password_failure">Authentication problem</string> <string name="wifi_disabled_password_failure">Authentication problem</string>

8
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -31,6 +31,7 @@ import android.net.wifi.WifiConfiguration.AuthAlgorithm;
import android.net.wifi.WifiConfiguration.IpAssignment; import android.net.wifi.WifiConfiguration.IpAssignment;
import android.net.wifi.WifiConfiguration.KeyMgmt; import android.net.wifi.WifiConfiguration.KeyMgmt;
import android.net.wifi.WifiConfiguration.ProxySettings; import android.net.wifi.WifiConfiguration.ProxySettings;
import android.net.wifi.WifiConfiguration.Status;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WpsConfiguration; import android.net.wifi.WpsConfiguration;
import android.net.wifi.WpsConfiguration.Setup; import android.net.wifi.WpsConfiguration.Setup;
@@ -216,6 +217,13 @@ public class WifiConfigController implements TextWatcher,
} else { } else {
mProxySettingsSpinner.setSelection(PROXY_NONE); 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 */ /* Show network setup options only for a new network */