Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd685cac authored by Salvador Martinez's avatar Salvador Martinez Committed by Android (Google) Code Review
Browse files

Merge "Updated summary logic for wifi" into nyc-mr1-dev

parents 31bc1f5e 5d937fc9

packages/SettingsLib/res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -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>

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+4 −1
Original line number Diff line number Diff line
@@ -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();