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

Commit 5070e45a authored by Isaac Levy's avatar Isaac Levy
Browse files

Fixing Wifi strings and pref ordering per ui 

- also no longer disabling wifi_watchdog toggle when radio is off.

Change-Id: Ic52249afd619028fe2765f434ee166f3d36e14fd
parent 778e5240

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -1135,9 +1135,9 @@ 
    <!-- Checkbox summary for option to notify user when open networks are nearby -->

    <string name="wifi_notify_open_networks_summary">Notify me when an open network is available</string>

    <!-- Checkbox title for option to toggle wifi watchdog service -->

    <string name="wifi_enable_watchdog_service">Wi-Fi Connectivity Checks</string>

    <string name="wifi_enable_watchdog_service">Avoid poor connections</string>

    <!-- Checkbox summary for option to toggle wifi watchdog service -->

    <string name="wifi_enable_watchdog_service_summary">Detect and manage potential network connectivity problems</string>

    <string name="wifi_enable_watchdog_service_summary">Don\'t use a Wi-Fi network unless it has a decent internet connection</string>

    <!-- Setting title for setting the wifi sleep policy -->

    <string name="wifi_setting_sleep_policy_title">Wi-Fi disconnect policy</string>

    <!-- Setting summary for setting the wifi sleep policy -->
@@ -1219,7 +1219,7 @@ 
    <!-- Status for networks disabled for unknown reason -->

    <string name="wifi_disabled_generic">Disabled</string>

    <!-- Status for networked disabled from a DNS or DHCP failure -->

    <string name="wifi_disabled_network_failure">Avoided poor connection</string>

    <string name="wifi_disabled_network_failure">Avoided poor internet connection</string>

    <!-- Status for networks disabled from authentication failure (wrong password

         or certificate). -->

    <string name="wifi_disabled_password_failure">Authentication problem</string>

res/xml/wifi_advanced_settings.xml

+7 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ 
            android:summary="@string/wifi_notify_open_networks_summary"

            android:persistent="false" />



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

    <CheckBoxPreference

            android:key="wifi_enable_watchdog_service"

            android:title="@string/wifi_enable_watchdog_service"

            android:summary="@string/wifi_enable_watchdog_service_summary"

            android:persistent="false" />



    <ListPreference

            android:key="sleep_policy"

            android:title="@string/wifi_setting_sleep_policy_title"
@@ -40,6 +33,13 @@ 
            android:entryValues="@array/wifi_sleep_policy_values"

            />



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

    <CheckBoxPreference

            android:key="wifi_enable_watchdog_service"

            android:title="@string/wifi_enable_watchdog_service"

            android:summary="@string/wifi_enable_watchdog_service_summary"

            android:persistent="false" />



    <ListPreference

            android:key="frequency_band"

            android:title="@string/wifi_setting_frequency_band_title"

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

+0 −2
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment 
        watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),

                Secure.WIFI_WATCHDOG_ON, 1) == 1);



        watchdogEnabled.setEnabled(mWifiManager.isWifiEnabled());



        ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);



        if (mWifiManager.isDualBandSupported()) {