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

Commit d80ff0a4 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by android code review
Browse files

Merge "wifi: update text displayed during hotspot on/off"

parents 60ec22d1 9fc89cc8

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1398,6 +1398,10 @@ 
    <!-- Wifi AP settings-->

    <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->

    <string name="wifi_tether_checkbox_text">Portable Wi-Fi hotspot</string>

    <!-- Summary text when turning hotspot on -->

    <string name="wifi_tether_starting">Turning hotspot on\u2026</string>

    <!-- Summary text when turning hotspot off -->

    <string name="wifi_tether_stopping">Turning off hotspot\u2026</string>

    <!-- Subtext for wifi tether checkbox on success -->

    <string name="wifi_tether_enabled_subtext">Portable hotspot <xliff:g id="network_ssid">%1$s</xliff:g> active</string>

    <!-- Subtext for wifi tether checkbox on failure -->

src/com/android/settings/wifi/WifiApEnabler.java

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class WifiApEnabler { 
    private void handleWifiApStateChanged(int state) {

        switch (state) {

            case WifiManager.WIFI_AP_STATE_ENABLING:

                mCheckBox.setSummary(R.string.wifi_starting);

                mCheckBox.setSummary(R.string.wifi_tether_starting);

                mCheckBox.setEnabled(false);

                break;

            case WifiManager.WIFI_AP_STATE_ENABLED:
@@ -193,7 +193,7 @@ public class WifiApEnabler { 
                mCheckBox.setEnabled(true);

                break;

            case WifiManager.WIFI_AP_STATE_DISABLING:

                mCheckBox.setSummary(R.string.wifi_stopping);

                mCheckBox.setSummary(R.string.wifi_tether_stopping);

                mCheckBox.setEnabled(false);

                break;

            case WifiManager.WIFI_AP_STATE_DISABLED: