diff options
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 682af8bd536f..08e5164fb252 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -64,8 +64,10 @@ <string name="wifi_disabled_password_failure">Authentication problem</string> <!-- Summary for the remembered network but currently not in range. --> <string name="wifi_not_in_range">Not in range</string> + <!-- Summary for the network but no internet connection was detected. --> + <string name="wifi_no_internet_no_reconnect">No Internet Access Detected, won\'t automatically reconnect.</string> <!-- Summary for the remembered network but no internet connection was detected. --> - <string name="wifi_no_internet">No Internet Access Detected, won\'t automatically reconnect.</string> + <string name="wifi_no_internet">No Internet Access.</string> <!-- Summary for saved networks --> <string name="saved_network">Saved by <xliff:g id="name">%1$s</xliff:g></string> diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 92f1b18c9444..b63752c22521 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -409,7 +409,10 @@ public class AccessPoint implements Comparable<AccessPoint> { String format = mContext.getString(R.string.available_via_passpoint); summary.append(String.format(format, config.providerFriendlyName)); } else if (config != null && config.hasNoInternetAccess()) { - summary.append(mContext.getString(R.string.wifi_no_internet)); + int messageID = config.getNetworkSelectionStatus().isNetworkPermanentlyDisabled() + ? R.string.wifi_no_internet_no_reconnect + : R.string.wifi_no_internet; + summary.append(mContext.getString(messageID)); } else if (config != null && !config.getNetworkSelectionStatus().isNetworkEnabled()) { WifiConfiguration.NetworkSelectionStatus networkStatus = config.getNetworkSelectionStatus(); |