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

Commit dd439e8c authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" into cm-11.0

parents 1e4b5989 b60affed

packages/SettingsProvider/res/values/defaults.xml

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ 
         0 means no timeout; battery sounds will always play

         >0 is milliseconds of screen-off time after which battery sounds will not play -->

    <integer name="def_low_battery_sound_timeout">0</integer>



    <!-- Default for Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE -->

    <integer name="def_wifi_scan_always_available">0</integer>



    <!-- Default for Settings.System.STATUS_BAR_BATTERY -->

    <integer name="def_battery_style">0</integer>

    <!-- Default for Settings.System.STATUS_BAR_BATTERY_SHOW_PERCENT -->

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -2360,6 +2360,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            loadIntegerSetting(stmt, Settings.Global.LOW_BATTERY_SOUND_TIMEOUT,

                    R.integer.def_low_battery_sound_timeout);



            loadIntegerSetting(stmt, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE,

                    R.integer.def_wifi_scan_always_available);



            // --- New global settings start here

            loadIntegerSetting(stmt, Settings.Global.TETHER_DUN_REQUIRED,

                    R.integer.def_tether_dun_required);