OSDN Git Service

Allow enabling Wifi when in airplane mode.
authorMike Lockwood <lockwood@android.com>
Thu, 30 Jul 2009 06:25:10 +0000 (23:25 -0700)
committerMike Lockwood <lockwood@android.com>
Thu, 30 Jul 2009 06:53:44 +0000 (23:53 -0700)
commit83bcc98af19597a213a8d174e8f1b47453d513ce
treec1898d10bcaf0720ea5e2566365128e641faca18
parentf0484951fbff3f34407584b73b45f7f75cb4c989
Allow enabling Wifi when in airplane mode.

If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

We also allow access to the VPN settings under the same circumstances.

Signed-off-by: Mike Lockwood <lockwood@android.com>
res/xml/wireless_settings.xml
src/com/android/settings/AirplaneModeEnabler.java
src/com/android/settings/WirelessSettings.java
src/com/android/settings/wifi/WifiEnabler.java