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

Commit 5ff3c730 authored by Thomas Nguyen's avatar Thomas Nguyen Committed by Android (Google) Code Review
Browse files

Merge "Define a list of radios for SATELLITE_MODE_RADIOS" into udc-dev

parents 54a9873a 492a9a5a

packages/SettingsProvider/res/values/defaults.xml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
    <!-- Comma-separated list of bluetooth, wifi, and cell. -->

    <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,uwb,wifi,wimax</string>

    <string name="airplane_mode_toggleable_radios" translatable="false">bluetooth,wifi</string>

    <string name="def_satellite_mode_radios" translatable="false"></string>

    <integer name="def_satellite_mode_enabled" translatable="false">0</integer>

    <string name="def_bluetooth_disabled_profiles" translatable="false">0</string>

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

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

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

+6 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,12 @@ class DatabaseHelper extends SQLiteOpenHelper { 
            loadStringSetting(stmt, Settings.Global.AIRPLANE_MODE_RADIOS,

                    R.string.def_airplane_mode_radios);



            loadStringSetting(stmt, Global.SATELLITE_MODE_RADIOS,

                    R.string.def_satellite_mode_radios);



            loadIntegerSetting(stmt, Global.SATELLITE_MODE_ENABLED,

                    R.integer.def_satellite_mode_enabled);



            loadStringSetting(stmt, Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,

                    R.string.airplane_mode_toggleable_radios);