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

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

Merge "Settings: fix automatically connect wrongly in WLAN"

parents 2f7cb6b6 78d0bf27

res/values-zh-rCN/strings.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -2733,7 +2733,6 @@ 
    <string name="wifi_advanced_network_netmask">掩码</string>

    <string name="wifi_advanced_network_netmask">掩码</string>

    <string name="bluetooth_dun_profile_summary_use_for">用于网络拨号</string>

    <string name="bluetooth_dun_profile_summary_use_for">用于网络拨号</string>

    <string name="lock_to_app_start_step1">打开设置</string>

    <string name="lock_to_app_start_step1">打开设置</string>

    <string name="wifi_autoconn_type">WIFI 自动连接类型</string>

    <string name="sub_activate_failed">启动失败</string>

    <string name="sub_activate_failed">启动失败</string>

    <string name="bluetooth_sap_profile_summary_use_for">用于SIM卡</string>

    <string name="bluetooth_sap_profile_summary_use_for">用于SIM卡</string>

    <string name="sim_pin_enable_failed">无法启动PIN</string>

    <string name="sim_pin_enable_failed">无法启动PIN</string>

res/values/strings.xml

100644 → 100755
+0 −1
Original line number Original line Diff line number Diff line
@@ -6283,7 +6283,6 @@ 
    <string name="wifi_auto_connect_type_title">Auto connect type</string>

    <string name="wifi_auto_connect_type_title">Auto connect type</string>

    <string name="wifi_auto_connect_type_summary">Specify network connection type</string>

    <string name="wifi_auto_connect_type_summary">Specify network connection type</string>

    <string name="wifi_menu_disconnect">Disconnect from network</string>

    <string name="wifi_menu_disconnect">Disconnect from network</string>

    <string name="wifi_autoconn_type">wifi_auto_connect_type</string>

    <string name="wifi_setting_connect_type_error">There was a problem setting the connect type.</string>

    <string name="wifi_setting_connect_type_error">There was a problem setting the connect type.</string>

    <string name="cellular_to_wlan_title">Cellular->WLAN</string>

    <string name="cellular_to_wlan_title">Cellular->WLAN</string>

    <string name="usb_sdcard_summary">Lets you transfer media files in the SD card on computer</string>

    <string name="usb_sdcard_summary">Lets you transfer media files in the SD card on computer</string>

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

100644 → 100755
+5 −2
Original line number Original line Diff line number Diff line
@@ -110,6 +110,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
    private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";

    private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";

    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";

    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";





    private static final String WIFI_AUTO_CONNECT_TYPE = "wifi_auto_connect_type";



    private static boolean savedNetworksExist;

    private static boolean savedNetworksExist;





    private final IntentFilter mFilter;

    private final IntentFilter mFilter;
@@ -374,8 +376,9 @@ public class WifiSettings extends RestrictedSettingsFragment 
        }

        }





        if (getResources().getBoolean(R.bool.config_auto_connect_wifi_enabled)) {

        if (getResources().getBoolean(R.bool.config_auto_connect_wifi_enabled)) {

            mAutoConnect = Settings.System.getInt(getActivity().getContentResolver(),

            mAutoConnect = Settings.System.getInt(

                    getResources().getString(R.string.wifi_autoconn_type),

                    getActivity().getContentResolver(),

                    WIFI_AUTO_CONNECT_TYPE,

                    getResources().getInteger(R.integer.wifi_autoconn_type_auto)) ==

                    getResources().getInteger(R.integer.wifi_autoconn_type_auto)) ==

                    getResources().getInteger(R.integer.wifi_autoconn_type_auto);

                    getResources().getInteger(R.integer.wifi_autoconn_type_auto);

        }

        }