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

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

Merge "Wifi: Interface provision to configure Auto Connection"

parents dd93197a bfd00992

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -2940,6 +2940,15 @@ public final class Settings { 
         */

        public static final String EGG_MODE = "egg_mode";



         /**

         * Whether wifi settings will connect to access point automatically

         * 0 = automatically

         * 1 = manually

         * @hide

         */

        public static final String WIFI_AUTO_CONNECT_TYPE = "wifi_auto_connect_type";





        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.
@@ -2958,6 +2967,7 @@ public final class Settings { 
            WIFI_STATIC_NETMASK,

            WIFI_STATIC_DNS1,

            WIFI_STATIC_DNS2,

            WIFI_AUTO_CONNECT_TYPE,

            BLUETOOTH_DISCOVERABILITY,

            BLUETOOTH_DISCOVERABILITY_TIMEOUT,

            DIM_SCREEN,

core/res/res/values/bools.xml

+2 −0
Original line number Diff line number Diff line
@@ -34,4 +34,6 @@ 
    <bool name="target_honeycomb_needs_options_menu">true</bool>

    <!-- Whether to enable softap extention feature -->

    <bool name="config_softap_extention">true</bool>

    <!-- Whether to enable auto connection feature -->

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

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2231,4 +2231,6 @@ 


  <!-- From keyguard for showing am/pm in unlock screen -->

  <java-symbol type="bool" name="config_show_ampm_in_unlock_screen" />

  <!-- for wifi auto connection -->

  <java-symbol type="bool" name="wifi_autocon" />

</resources>