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

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

Merge "Revert "wlan: Provide runtime option to enable or disable rssi threshold (settings)""

parents c828e57b a9517f2b

res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -1475,10 +1475,6 @@ 
    <string name="wifi_poor_network_detection">Avoid poor connections</string>

    <!-- Checkbox summary for option to toggle poor network detection -->

    <string name="wifi_poor_network_detection_summary">Don\'t use a Wi\u2011Fi network unless it has a good Internet connection</string>

    <!-- Checkbox title for option to toggle wifi RSSI threshold check -->

    <string name="wifi_rssi_threshold_check">Enable RSSI threshold</string>

    <!-- Checkbox summary for option to toggle poor network detection -->

    <string name="wifi_rssi_threshold_check_summary">Do not connect to an AP if RSSI is poor</string>

    <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->

    <string name="wifi_avoid_poor_network_detection_summary">Only use networks that have a good Internet connection</string>

    <!-- Checkbox title for option to scan always available setting -->

res/xml/wifi_advanced_settings.xml

+0 −7
Original line number Diff line number Diff line
@@ -61,13 +61,6 @@ 
            android:persistent="false"/>



    <!-- android:dependency="enable_wifi" -->

    <CheckBoxPreference

            android:key="wifi_rssi_threshold_check"

            android:title="@string/wifi_rssi_threshold_check"

            android:summary="@string/wifi_rssi_threshold_check_summary"

            android:persistent="false" />





    <ListPreference

            android:key="sleep_policy"

            android:title="@string/wifi_setting_sleep_policy_title"

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

+0 −11
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment 
    private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";

    private static final String KEY_SLEEP_POLICY = "sleep_policy";

    private static final String KEY_SCAN_ALWAYS_AVAILABLE = "wifi_scan_always_available";

    private static final String KEY_WIFI_RSSI_THRESHOLD_CHECK = "wifi_rssi_threshold_check";

    private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";

    private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";

    private static final String KEY_WIFI_DIRECT = "wifi_direct";
@@ -150,11 +149,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment 
        scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),

                    Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);



        CheckBoxPreference wifiRssiThresholdCheck =

            (CheckBoxPreference) findPreference(KEY_WIFI_RSSI_THRESHOLD_CHECK);

        wifiRssiThresholdCheck.setChecked(Global.getInt(getContentResolver(),

                    Global.WIFI_RSSI_THRESHOLD, 0) == 1);



        Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION);

        intent.setClassName("com.android.certinstaller",

                "com.android.certinstaller.CertInstallerMain");
@@ -334,11 +328,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment 
            Global.putInt(getContentResolver(),

                    Global.WIFI_SCAN_ALWAYS_AVAILABLE,

                    ((SwitchPreference) preference).isChecked() ? 1 : 0);

        } else if (KEY_WIFI_RSSI_THRESHOLD_CHECK.equals(key)) {

            Global.putInt(getContentResolver(),

                    Global.WIFI_RSSI_THRESHOLD,

                    ((CheckBoxPreference) preference).isChecked() ? 1 : 0);

            mWifiManager.enableRssiThreshold(((CheckBoxPreference) preference).isChecked() ? 1 : 0);

        } else {

            return super.onPreferenceTreeClick(screen, preference);

        }