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

Commit c5b62ad4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Open WiFi network when pull out the USB line."

parents 159d9e25 49f192aa

res/values/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ 


    <bool name="config_regional_usb_tethering_quick_start_enable">false</bool>

    <bool name="config_regional_hotspot_tether_help_enable">false</bool>

    <!-- Config to enable/disable the USB line-->

    <bool name="config_usb_line_enable">false</bool>

    <bool name="config_show_dialog_open_wifi_when_tethering_open">false</bool>

    <bool name="config_regional_account_check_dialog_enable">false</bool>

    <!-- Tethering & Mobile HotSpots display summary on Tmoblie -->

src/com/android/settings/TetherSettings.java

+5 −4
Original line number Diff line number Diff line
@@ -714,10 +714,11 @@ public class TetherSettings extends RestrictedSettingsFragment 
        if (preference == mUsbTether) {

            if (showNoSimCardDialog(getActivity())) {

                ((SwitchPreference) preference).setChecked(false);

            } else if (mUsbTether.isChecked() && mUsbEnable) {

            } else if (mUsbTether.isChecked()) {

                if (mUsbEnable) {

                    //save the current wifi status for restore

                    mIsWifiEnabled = mWifiStatusManager.isWifiEnabled();



                }

                if (isFirstUseUSBTethering(getActivity())) {

                    showFirstUseUSBTetheringDialog(getActivity());

                }