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

Commit 02d81743 authored by Quang Luong's avatar Quang Luong
Browse files

Display summary for unconnected OSU Provider APs 

OSU Provider APs should now display "Tap to set up" in their
summary in the wifi picker.

Tracking bug for adding robolectric tests: b/122849296

Test: manual, build and visual check
Bug: 118705403
Change-Id: I8ccf6bbe871f57b29b90fc07f5f71a26cc14ac63
parent 70ccf3cd

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
    <string name="ssid_by_passpoint_provider"><xliff:g id="ssid" example="Cafe Wifi">%1$s</xliff:g> by <xliff:g id="passpointProvider" example="Passpoint Provider">%2$s</xliff:g></string>

    <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->

    <string name="available_via_passpoint">Available via %1$s</string>

    <!-- Status message of OSU Provider network when not connected. [CHAR LIMIT=NONE] -->

    <string name="tap_to_set_up">Tap to set up</string>

    <!-- Package name for Settings app-->

    <string name="settings_package" translatable="false">com.android.settings</string>

    <!-- Package name for Certinstaller app-->

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

+2 −0
Original line number Diff line number Diff line
@@ -926,6 +926,8 @@ public class AccessPoint implements Comparable<AccessPoint> { 
            } else if (mIsCarrierAp) {

                summary.append(String.format(mContext.getString(

                        R.string.available_via_carrier), mCarrierName));

            } else if (isOsuProvider()) {

                summary.append(mContext.getString(R.string.tap_to_set_up));

            } else if (!isReachable()) { // Wifi out of range

                summary.append(mContext.getString(R.string.wifi_not_in_range));

            } else { // In range, not disabled.