Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated summary logic for wifi

Browse Source 
Wifi summary claimed it would not
reconnect under conditions where it should.
This has been changed to properly say when an
AP will automatically be reconnected to.

Test: make RunSettingsLibRoboTests
Bug: 29973023
Change-Id: I2ffb4ec3b83e93c3df9ee179fc6a6bf59acec42e
This commit is contained in:
Salvador Martinez
2016-09-23 08:54:20 -07:00
parent 2eb458b8cd
commit 5d937fc95f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/res/values/strings.xml
View File

@@ -64,8 +64,10 @@
<string name="wifi_disabled_password_failure">Authentication problem</string> <string name="wifi_disabled_password_failure">Authentication problem</string>
<!-- Summary for the remembered network but currently not in range. --> <!-- Summary for the remembered network but currently not in range. -->
<string name="wifi_not_in_range">Not in range</string> <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. --> <!-- 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 --> <!-- Summary for saved networks -->
<string name="saved_network">Saved by <xliff:g id="name">%1$s</xliff:g></string> <string name="saved_network">Saved by <xliff:g id="name">%1$s</xliff:g></string>

5
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -409,7 +409,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
String format = mContext.getString(R.string.available_via_passpoint); String format = mContext.getString(R.string.available_via_passpoint);
summary.append(String.format(format, config.providerFriendlyName)); summary.append(String.format(format, config.providerFriendlyName));
} else if (config != null && config.hasNoInternetAccess()) { } 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()) { } else if (config != null && !config.getNetworkSelectionStatus().isNetworkEnabled()) {
WifiConfiguration.NetworkSelectionStatus networkStatus = WifiConfiguration.NetworkSelectionStatus networkStatus =
config.getNetworkSelectionStatus(); config.getNetworkSelectionStatus();