Commit Graph

25 Commits

Author SHA1 Message Date
Amith Yamasani
0f85c48d6c Remove / re-word some settings for WiFi-only devices.
Bug: 3468248

1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"

Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
2011-02-24 10:53:29 -08:00
Robert Greenwalt
6f3a98bb00 Hide http proxy UI
We don't have support in the media code so rather than confuse the users
with some apps using proxies and some not we'll just turn it off for all
for now.

bug:3283883
Change-Id: If29bb34fce04eab5adc9b5180b70dbfd718cc709
2010-12-29 16:25:28 -08:00
Nick Pelly
b8be6da887 Fix master build. WirelessSettings is a fragment in master.
Change-Id: I9ad1104605558859d90dd1ecc083e9ef35bf3fa0
2010-12-13 14:02:07 -08:00
Nick Pelly
e537b0eb99 am 934c1b9f: am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit '934c1b9f4b475112e635989fb3d1a9d191a9c9e7':
  Update Settings for new NfcAdapter.getDefaultAdapter(Context)
2010-12-13 12:30:40 -08:00
Nick Pelly
267419ff8b Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
2010-12-09 19:39:58 -08:00
Nick Pelly
e0b6d45386 am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread
Merge commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'

* commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
2010-10-17 11:15:48 -07:00
Nick Pelly
a57eacef3c Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:15:27 -07:00
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
2010-09-29 12:10:35 -07:00
Nick Pelly
ad50ba065d Add NFC checkbox to Settings app.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Heavily modified to remove dead code.

Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
2010-09-28 21:26:50 -07:00
Amith Yamasani
d79934731c Refactor settings top level activities to use fragments.
Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
2010-08-18 22:59:33 -07:00
Danica Chang
32711b6752 bluetooth tethering
Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
2010-08-17 19:07:07 -07:00
Oscar Montemayor
05411893af Enabling users toset the Global Proxy from wireless settings.
Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834
2010-08-04 14:52:21 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Robert Greenwalt
c4764d2483 Update Settings UI regarding tethering.
If tethering is disabled (build var or a gservices property) for the device,
don't show any of the tethering options.  If Usb Tethering is disabled (config.xml) don't show
Usb Options.  If Wifi Tethering is disabled (config.xml) don't show Wifi Options.
2010-02-16 16:56:43 -08:00
Chia-chi Yeh
b90452f3d2 Settings: revise WifiEnabler and BluetoothEnabler.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.

Related bug: 2053751
2010-01-15 06:12:29 +08:00
Chia-chi Yeh
4e14211d21 Settings: revise WifiSettings. 2009-12-25 14:48:46 +08:00
Jeff Sharkey
1c4e96864f Allow bluetooth in airplane mode when in "toggleable" list.
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of
radios that can be toggled while in airplane mode.  This CL
changes BluetoothEnabler to respect this.

It parallels the logic in WifiEnabler, which enables OEMs
to allow Wifi changes when in airplane mode.

Most existing devices don't include "bluetooth" in the
toggleable list, which means bluetooth will continue to be
disabled when in airplane mode for those devices.

Fixes http://b/2297314
2009-12-22 14:35:44 -08:00
Michael Chan
0cb3743e93 b/2219381 Gray out Bluetooth Settings for the emulator
Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6
2009-10-29 14:42:06 -07:00
Michael Chan
d3da3379a4 b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off. 2009-09-02 15:20:07 -07:00
Chouting Zhang
71cc49e480 Airplane Mode in Emergency Callback Mode (ECM)
When user tries to change Airplane Mode between ON & OFF
in ECM mode, a notice should be shown to indicate it's in ECM mode,
and ask if user wants to exit ECM, if yes, then the Airplane Mode
is changed after ECM mode exit. If not, Airplane Mode should not be
changed.
2009-08-31 09:45:21 -07:00
Mike Lockwood
83bcc98af1 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>
2009-07-29 23:53:44 -07:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
abc48f80d8 Code drop from //branches/cupcake/...@124589 2008-12-17 18:06:01 -08:00
The Android Open Source Project
de2d9f5f10 Initial Contribution 2008-10-21 07:00:00 -07:00