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

Commit c0850a75 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add summary for hostspot when airplane is on."

parents 1bbe424e 2c45737d

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2142,6 +2142,8 @@ 
    <string name="wifi_hotspot_configure_ap_text_summary">AndroidAP WPA2 PSK hotspot</string>

    <!-- Default access point SSID used for tethering -->

    <string name="wifi_tether_configure_ssid_default">AndroidHotspot</string>

    <!-- Summary text when hotspot is disabled because airplane mode is on [CHAR LIMIT=80]-->

    <string name="wifi_tether_disabled_by_airplane">Unavailable because airplane mode is turned on</string>









    <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary









         Wi-Fi Testing on the diagnostic screen-->
































src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -202,7 +202,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController







        boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),









                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;









        if (isAirplaneMode) {









            mPreference.setSummary(R.string.summary_placeholder);









            mPreference.setSummary(R.string.wifi_tether_disabled_by_airplane);









        }









    }









    //
































tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java



+1
−1






























Original line number
Diff line number
Diff line







@@ -185,7 +185,7 @@ public class WifiTetherPreferenceControllerTest {







        receiver.onReceive(RuntimeEnvironment.application, broadcast);



















        assertThat(mPreference.getSummary().toString()).isEqualTo(









                RuntimeEnvironment.application.getString(R.string.summary_placeholder));









                "Unavailable because airplane mode is turned on");









    }



















    @Test