History log of /packages/apps/Settings/src/com/android/settings/WirelessSettings.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
9627a8ea151c1f27e5e9f34592c7b34fea3101c3 23-Sep-2012 Amith Yamasani <yamasani@google.com> Show more settings and add restrictions/dialogs for secondary users

Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users

Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
6a5929b086a61a955a4a2f43f5fa251e8754ff4a 11-Sep-2012 Christopher Tate <ctate@google.com> Update Settings app to use new namespace for airplane-mode settings

Bug 7132230

Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
ef57ed71bf390858cb83253bd193a192bb48346c 21-Jun-2012 Jake Hamby <jhamby@google.com> Add menu item to Settings to go to Cell Broadcast settings.

Add menu item to Settings when "config_cellBroadcastAppLinks"
config option is set to true to jump to the Cell Broadcast app
settings activity. This enables the Cell Broadcast launcher
icon to be removed, while still allowing access to the app
(by adding a similar menu item to the MMS app) and its settings
activity (this settings link).

The menu item will not be added if the CellBroadcastReceiver
package is disabled or not installed.

Bug: 6709985
Change-Id: If3a3016ceea70704790964c0b712c31cb38f7b62
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
936e3faae11441fad05bf244fa44a29515edd1d8 08-May-2012 Irfan Sheriff <isheriff@google.com> Remove NSD checkbox

Bug: 6449478
Change-Id: Ic4aa44cb08843819c3290b16d906c989ee306727
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
b0b37ae21c172491bc170659b5f429601858ddc1 24-Apr-2012 Amith Yamasani <yamasani@google.com> Help menus for several screens.

Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
536c3d7651d0e37b13b5ee655c215207a39dff7d 18-Apr-2012 Irfan Sheriff <isheriff@google.com> Add Nsd settings checkbox

Change-Id: I58e54a8bed02ed7bd99b0f284279b6c799e3369f
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
d220c8a6fecd824bdc15c9587451ce2a0d347b44 08-Mar-2012 Amith Yamasani <yamasani@google.com> Fix NPE due to removed preference.

Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
8c2ac71b34a00a863b2c3ddcd5b5dae1d9bd6a25 29-Nov-2011 Irfan Sheriff <isheriff@google.com> Add wifi direct settings UI

- Use switch for toggling
- Follow string and UI suggestions from UX folks

The goal is to keep the interaction minimal - PBC is used when possible and keypad/display
are used only if really necessary

Bug: 5332330
Change-Id: I83e91ad3a393c143e70f1f2b6a842b95eacde404
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce 13-Oct-2011 tk.mun <tk.mun@samsung.com> Wimax : 4G settings menu and 4G MAC address.

1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
74fda1065a72f835c0ed8cee19c6eb77ffc56743 21-Oct-2011 Irfan Sheriff <isheriff@google.com> Remove wifidirect UI listing

Was used for testing. remove it until proper UI is
added

Bug: 5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
3d670de5ce9180e0a75d0884832c4714cb56e1b5 21-Sep-2011 Jeff Hamilton <jham@android.com> Bring back the Android Beam settings panel.

Bug: 5350022
Change-Id: I22d2c6f91f7ab86501021fe97a2d57b109ed10bf
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
a83a24f48a8286ee3d67acc5fdcfb723acc56ada 16-Sep-2011 Jeff Sharkey <jsharkey@android.com> Surface tethering stats in data usage.

Bug: 5244846
Change-Id: Ib4ac03ab634278714576a66ef8d6fdbc6d15c82a
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
943af0bc69048d827c3dd1b92daeaa2cf1b77145 14-Sep-2011 Martijn Coenen <maco@google.com> Remove NFC sharing from Settings.

Bug: 5297151
Change-Id: I64304230296912519aa057a89f139a2242b557e3
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
167d7186a73b1126a8baa4fd3c8b9156b2712c60 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Use hasSystemFeature() to check for p2p

Bug: 5267396
Change-Id: I55cc85745dff5de43f73ec260b82ad100e237555
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
e964d57152a503b6337fef145913ca17d5eff1b4 01-Sep-2011 Irfan Sheriff <isheriff@google.com> Remove device name and display debug setting

Device name in WifiP2pConfig is going away

Bug: 5247957
Change-Id: Ib6ada8420ed8e7fbfcab85eee5f1665e33e8f024
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
7edbc609fdccff3367b119da46ff1adbe4477d10 01-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Use the new isNetworkSupported api for wifi-only"
8af88fb8387259e51615709b2d1ea0260f7057fd 31-Aug-2011 Robert Greenwalt <rgreenwalt@google.com> Use the new isNetworkSupported api for wifi-only

Didn't have an API for this before so people used a hacked system property (ro.carrier)
to determine if the device supported mobile data. Added new API and switching callsites.

bug:5087537
Change-Id: Ibd799559be102a9e2fd552d1a23d1afbcf8f4614
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
1610a74a26763046c147b2cf5cda7d84a62b95ff 31-Aug-2011 Irfan Sheriff <isheriff@google.com> Expose wifi p2p toggle switch to user

We will not show the Wifi p2p settings to user but the turn on/off capability
is exposed to the user and applications will be expected to let user turn on
and turn off p2p at launch.

Remove the compound button integration from the settings page.

Bug: 5242230
Change-Id: I54ec307304256b051e85201b8bb829d0e5544bfc
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
0fb33abfb468f495b3223e08b3920aab86bea696 24-Aug-2011 Nick Pelly <npelly@google.com> Rename {zeroclick, share_tap} -> ndef_push in code.

Not sure what the product name will be, but ndef push seems to be a
nice neutral name for the code.

Text strings are left as "Share Tap" for now.

Change-Id: I9dbf82eda2273220c23f443710a340c2c93e8291
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
05e01be5111da41965d045e21f1b731bac536ae2 17-Aug-2011 repo sync <isheriff@google.com> Add p2p settings only in debug mode

Bug: 5002384
Change-Id: I12d691ea5b2c820c33ef8735d997a0c04b636aa7
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
9894d4ade475392f665bf87bf7f91d3cbed3eaa4 09-Aug-2011 Nick Pelly <npelly@google.com> Add support for NFC in airplane mode.

Also update logic in Settings for new async NfcAdapter.enable() and disable().

Change-Id: Ie1e5407498ac7beb5a4e21daec0ada0e8ae9c388
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
bb4bdc29d64714546255681fcd9c9d92efa9328f 28-Jul-2011 Martijn Coenen <maco@google.com> Add on/off actionbar switch for NFC Tap To Share.

Change-Id: I009a31d8862a23e15d89fe9813eca02e06469531
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
b98463f8b0de186dc263217286449a76d6df91a8 30-Jun-2011 repo sync <isheriff@google.com> Updated: Wi-Fi p2p initial UI implementation

Change-Id: If60f42f76fa07a868d2e11b012b4697252c69f5f
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
ba534408011905e657a143eeae9a4c0fa412e0ec 21-Jul-2011 Martijn Coenen <maco@google.com> Added setting for zero-click sharing over NFC.

Change-Id: I3848c4815d65d3a8b9b5e579c6a353dde6901ee4
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
dfc2637ebaee6e7467b0340ec652c29f6b5734ff 08-Jul-2011 Gilles Debunne <debunne@google.com> Removed summary text and categories in Wireless settings

Bug 5002377 and 5002476.

Change-Id: Ia35dd9701f59a18a812b5079396835cc19e6d901
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
e78c1879058571c00879f0d3e756951302adf513 21-Jun-2011 Gilles Debunne <debunne@google.com> Settings refactoring

Wifi and bluetooth pane refactored, main toggles moved to left pane.

Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
f1139aab801f89a19cf7c95f7c25fe49a4efc67b 29-Mar-2011 Jake Hamby <jhamby@google.com> Fix NPE in WirelessSettings.onCreate() for SDK and non-BT devices.

Fix NPE when entering Settings app in the SDK (and for devices without
Bluetooth). Also remove the "Bluetooth settings" item in addition to
the Bluetooth toggle item from Wireless settings when BT is missing.

Bug: 4149307
Change-Id: Iecc5960a193cf88664d3217b4d7bdbc2276dabc0
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
436b29e68e6608bed9e8e7d54385b8f62d89208e 08-Feb-2011 Jake Hamby <jhamby@google.com> Refactor Bluetooth settings for readability and performance.

Major refactoring of Bluetooth settings classes.
- Moved all functionality from LocalBluetoothManager into new
LocalBluetoothAdapter and LocalBluetoothPreferences, and into
existing classes.
- Refactored functionality from BluetoothEventRedirector into new
BluetoothEventManager class, deleting the original version. New
version uses a HashMap from action Strings to implementers of the
BluetoothEventManager.Handler interface.
- Created new BluetoothDiscoveryReceiver to update shared preferences
timestamp for Bluetooth discovery start/finish. This is the only event
handling we need to do when the settings app is not visible, so it has
its own receiver entry in AndroidManifest.xml. Edits are written using
QueuedWork.singleThreadExecutor(), which BroadcastReceiver knows about
and will wait for completion, eliminating the need for PendingResult.
- Miscellaneous cleanups to code style and logic for readability.
- Pulled some large switch statement code blocks into new methods.
- Changed all Bluetooth state references to the new BluetoothProfile
constants.
- Changed use of deprecated Notification constructor in
BluetoothPairingRequest to use Notification.Builder.
- Moved Utf8ByteLengthFilter helper function from BluetoothNamePreference
into its own class, and moved test cases into the same package.
- Moved all LocalBluetoothProfileManager functionality related to
specific profiles into new top-level classes (A2dpProfile, etc.), all
implementing the LocalBluetoothProfile interface.
- Moved all UI-related methods from CachedBluetoothDevice into the class
that uses the method, or into the static Utils class for shared methods.

Change-Id: I6d49b7f4ae0c7d7dcf62551ee40b51ecb5fe4f47
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
4ad4b4fdf7a36820ffc3a1048d8d7e030ead4591 26-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Just use device configuration for Tethering.

Don't need extra code here if the device is configured propertly.

Change-Id: Ieb65e36c1c91a62bbb0c8619e2efb34735fbb564
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
0f85c48d6c77e811f4d949503f0aa3efd908834d 24-Feb-2011 Amith Yamasani <yamasani@google.com> 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
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
6f3a98bb00f12851682c28d265be4f66fad85fd6 29-Dec-2010 Robert Greenwalt <rgreenwalt@google.com> 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
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
b8be6da8874da8e5bb58eba13217a2e9f33c710a 13-Dec-2010 Nick Pelly <npelly@google.com> Fix master build. WirelessSettings is a fragment in master.

Change-Id: I9ad1104605558859d90dd1ecc083e9ef35bf3fa0
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
e537b0eb999e32741bb4a9283eb0d6842cc64b99 13-Dec-2010 Nick Pelly <npelly@google.com> am 934c1b9f: am c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread

* commit '934c1b9f4b475112e635989fb3d1a9d191a9c9e7':
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
267419ff8b6a0458c098a1787e11df2bc9ddb38a 10-Dec-2010 Nick Pelly <npelly@google.com> Update Settings for new NfcAdapter.getDefaultAdapter(Context)

Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
e0b6d4538667282dbbdc017a610d9b052a46cd8e 17-Oct-2010 Nick Pelly <npelly@google.com> 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.
a57eacef3c7d267a534bb1d01471a9a9c12471ce 15-Oct-2010 Nick Pelly <npelly@google.com> Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.

Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
d83aaf28bce5472564ddfb6f3d8660459c826d17 29-Sep-2010 Nick Pelly <npelly@google.com> resolved conflicts for merge of 1ff9ad3f to master

Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
ad50ba065d31f3d8ec53c512b6ba5cf94d15d1e3 22-Sep-2010 Nick Pelly <npelly@google.com> 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
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
d79934731c8d33f6fc63b21c120b9ffba5d06f54 18-Aug-2010 Amith Yamasani <yamasani@google.com> 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.
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
32711b6752eb73324e1b10db975ac956888eda96 11-Aug-2010 Danica Chang <danicachang@google.com> bluetooth tethering

Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
05411893af4afc4bf7b8530d787c5b9e0bbeed39 04-Aug-2010 Oscar Montemayor <oam@google.com> Enabling users toset the Global Proxy from wireless settings.

Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
e434bfb216682a6ca331fa54ce58a2bff7adf8d7 09-May-2010 Robert Greenwalt <robdroid@android.com> String change - wifi tether = hotspot

bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
c4764d24837cf297440f0ee97fe8adb943c56fe0 12-Feb-2010 Robert Greenwalt <robdroid@android.com> 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.
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
b90452f3d26201ea6a231f2150204241e66cd3fb 12-Jan-2010 Chia-chi Yeh <chiachi@android.com> 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
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
4e14211d21387d645ecdad406f3350d36e5a8643 25-Dec-2009 Chia-chi Yeh <chiachi@android.com> Settings: revise WifiSettings.
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
1c4e96864f054f0d3d754d21eb4803fe0df6d89f 02-Dec-2009 Jeff Sharkey <jsharkey@android.com> 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
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
0cb3743e93aef81e7669f1e6c81184559e0f8154 29-Oct-2009 Michael Chan <mchan@android.com> b/2219381 Gray out Bluetooth Settings for the emulator

Change-Id: I11ae2e6c7652ba550aeadf0dadb6f520c19dedc6
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
d3da3379a480ce16cac735d88855b6e3d76597d3 03-Sep-2009 Michael Chan <mchan@android.com> b/2045917 Fixed the problem where Bluetooth enable/disable remain disabled when Airplane mode is turned off.
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
71cc49e480e7dfd5d0986d7600d0c73aecdbdf93 28-Aug-2009 Chouting Zhang <MichaelZhang@motorola.com> 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.
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
83bcc98af19597a213a8d174e8f1b47453d513ce 30-Jul-2009 Mike Lockwood <lockwood@android.com> 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>
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
afc4ab2ffbb8327ddce9907961295a32cbf49d0f 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
4e14e5ccbf1ef27220419849133d482a546d5c04 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
abc48f80d8747b4fc051b7dd364355ee667a9bac 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java
de2d9f5f109265873196f1615e1f3546b114aaa7 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/packages/apps/Settings/src/com/android/settings/WirelessSettings.java