Commit Graph

1451 Commits

Author SHA1 Message Date
jhtop.kim
01525c9a05 Bluetooth : fix to finish deviceprofilesettings activity when device is not bonded
- if cached device state is "BluetoothDevice.BOND_NONE" then finish activity

Change-Id: I5c981e8c4800c10f1f8570668794301d5da03188
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-07-18 15:49:12 -07:00
jhtop.kim
5ab6b6b004 Bluetooth : fix UI bug: Disable "OK" button if friendly name is null
- If device's name is null, BT address is set as friendly name.
- so, fixed. if name field is null "OK" button is disabled.

Change-Id: I04b59ebf13d1b3203acf7345bd531cc6c563da0d
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-07-18 15:44:14 -07:00
jhtop.kim
2affa6b28d Bluetooth : UI bug fix : Pairing dialog box takes space as character
- In pairing dialog box even if PIN was removed in text box, still the OK button is enabled
- When length is zero , disable the OK button in pairing dialog
- update fix to prevent error while mOkButton is not ceated.

Change-Id: I38ff3029cff2e7c4e87b7f9c93fa262125e91d44
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-07-18 15:32:25 -07:00
Jake Hamby
ca9812a852 Upgrade Bluetooth pairing dialogs for ICS.
* Change Bluetooth pairing dialogs to match ICS wireframes.
* Default to numeric soft keyboard for PIN entry, and add checkbox
  to allow user to switch to alphanumeric keyboard if necessary.
* Move all Bluetooth advanced settings into action bar menu.
* Toggle visibility by touching "My device" entry in devices list.

Change-Id: Ic2377eb4364f41d215181cb1e3933997c9db9106
2011-07-15 15:39:53 -07:00
Gilles Debunne
6dc0f9639e Refactor Bluetooth settings
Two lists: paired devices and available devices.
New item at top for the device itself (not connected to discoverable, this is a larger
refactoring).

New settings icon.

Change-Id: I788a6c0afdb07309d449a4d41a02cf8480c95a37
2011-07-08 09:40:47 -07:00
Gilles Debunne
606d878852 Merge "Changed text and appearance when Wifi/Bluetooth is off" 2011-07-07 16:04:53 -07:00
Gilles Debunne
18e9992a5e Changed text and appearance when Wifi/Bluetooth is off
A TextView is used as an empty view, centered on screen with the message.

Change-Id: I33825775d6b2ed212e5839cfac84d055b9336667
2011-07-07 16:04:00 -07:00
Matthew Xie
722934dbbc Merge "Show user dialog for BT connection and phonebook access" 2011-07-07 12:27:41 -07:00
Gilles Debunne
9416136b4d Bluetooth messages improved.
Tap to pair in place of searching. Message when no device is found.

Change-Id: I0a4b1fa140e8a30b154ae2686e9c75d3768fc44e
2011-06-30 15:44:07 -07:00
Matthew Xie
dbed12020c Show user dialog for BT connection and phonebook access
Show user dialog for incoming BT connection requests from unknown
devices. Move phone book access permission dialog from bluetooth to settings.
The permision dialog pops up to the screen properly instead of
always as notification. AT+CPBR will also use the permission dialog
to ask for user permission.

bug 4489572

Change-Id: Ic1e74b2a9416a462cac4f519240a313691da90c4
2011-06-29 23:33:26 -07:00
Gilles Debunne
4346cda76c Double list in Bluetooth Settings
Paired devices are listed first (from cache), followed by unpaired ones.
A scan is only started on user request or when there is no paired device
(should it be when there is no paired *connected* device?).

Wrench icon only displayed for paired devices.

Wrench click listener no longer uses mDeviceSettings which is unreliable
with ListView view recycling.

Fixed blinking ProgressCategory when the category was first in the list.

Change-Id: Ie749883426c12bd354da64733bd04b00304bc1f5
2011-06-28 18:17:30 -07:00
Gilles Debunne
dc7101ff88 Split ActionBar in Settings
Made menu item visible to force action bar, changed style.

Also change parent_fragment for items that have been moved to top level (wifi,
bluetooth, development, battery).

Change-Id: I62932ba55356abdfbf94942f5b4efaa0f15dbd6a
2011-06-27 17:00:23 -07:00
Gilles Debunne
2454f49c93 Fixed Bluetooth availability test in Settings
Added similar test for WiFi to be consistent.

Added null tests in BluetoothEnabler.

Change-Id: Ia6e7b150a1bc060c7ce0b4db12ab3f6c958af104
2011-06-21 16:37:26 -07:00
Gilles Debunne
e78c187905 Settings refactoring
Wifi and bluetooth pane refactored, main toggles moved to left pane.

Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
2011-06-21 11:05:29 -07:00
Amith Yamasani
3a5b3494a7 Make the BT class icon visible.
This change is required due to a change in the framework to accomodate smaller screen sizes.

Bug: 4519989
Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
2011-06-02 11:48:55 -07:00
Jake Hamby
f1139aab80 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
2011-03-28 20:25:23 -07:00
Amith Yamasani
f502eaba0a Flip the icon states for Bluetooth profile auto-connect settings
Bug: 4109035
Change-Id: Idb37a583957eeb8ea4c0b804e7933fd8e9af98e3
2011-03-15 15:14:48 -07:00
Jake Hamby
c777ee29c8 Improve Bluetooth tethering UI usability.
- Updated hint text for BT tethering checkbox to
  "[Sharing|not sharing] this [tablet|phone]'s mobile data connection".
- Show correct hint text when user enters tethering screen.
- Show correct status after user enables tethering when Bluetooth is off.
  When BluetoothPan.setBluetoothTethering(true) is called with BT off,
  BluetoothPanProfileHandler will add a broadcast receiver to enable
  tethering after BT turns on. This happens too late to show the correct
  status when TetherSettings gets the adapter state changed event, so set
  a flag (mBluetoothEnableForTether) instead, and call setBluetoothTethering
  ourselves after the state changes to ON. Also, clear the flag if the
  adapter state changes to OFF or ERROR.
- Show correct status when user enables tethering, then disables Bluetooth,
  then returns to the tethering screen. Previously it would show
  Bluetooth tethering enabled, even though adapter state was OFF.
- Show the number of connected devices in tethering preference screen.
- Distinguish between PANU and NAP in device profiles screen, and show
  appropriate text to clarify the direction of tethering.
- Remove profiles from device profiles list when the device removes the UUID
  (e.g. Mac OS X turning NAP on/off) and after a NAP disconnection when the
  remote device only supports PANU.

Bug: 3414575
Change-Id: I2c0830876d5b9bddb293e57c4d3ca74f105911b8
2011-03-09 14:56:56 -08:00
Jaikumar Ganesh
46a2941b3f Merge "Return profile state disconnected when not yet bound to service." into honeycomb-mr1 2011-03-08 19:40:12 -08:00
Jaikumar Ganesh
37bf3353d1 Return profile state disconnected when not yet bound to service.
Bug: 4007080

There is a another bug open to handle service object being null
and a connect / disconnect call being made.

Change-Id: I30f6923323532b5756338b350ec4ce0e1a31d1ff
2011-03-08 18:04:25 -08:00
Jaikumar Ganesh
6eb84ac6de Settings app: Run Bluetooth Event receiver when not in fg.
Also fix connection indication issues.
Fixes bugs 3510336 and 3513352

Change-Id: Iaa47c9d7fd04fa5dd2700f55993ba2fd1a78fd70
2011-03-04 14:53:44 -08:00
Jaikumar Ganesh
50e0b0cf87 Fix settings app not showing correct profile connection state message.
Bug:3385085
Change-Id: Ie4b7eb6bc9d8c91264cf7f68d7830c110e34496d
2011-03-04 10:27:31 -08:00
Jaikumar Ganesh
98fc5e2570 Fix crashes with OPP profile in Settings app.
Change-Id: I712667f11c0de849da48add912421dfca3e85484
2011-03-01 19:12:44 -08:00
Jake Hamby
436b29e68e 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
2011-03-01 18:44:36 -08:00
Jaikumar Ganesh
5a3120cab7 Display imaging icon for printer devices.
Change-Id: Iea2a77bb3b79934174f6e39b080ade47bd119773
2011-02-28 11:27:35 -08:00
Jaikumar Ganesh
9ad703cdb9 Make BluetoothPan implement BluetoothProfile.
This makes it consistent across all other profiles.

Change-Id: I4c0694d042d7ed1b78c92ca3be38c8d543886769
2011-02-23 13:30:08 -08:00
Jaikumar Ganesh
77bcd7e807 Update code for making BluetoothInputProfile implement BluetoothProfile.
Change-Id: Ib04abc590429eaa40c0ea1bd24fa728d41306fe8
2011-02-18 14:57:25 -08:00
Jaikumar Ganesh
d955af8461 Changes for public API of Bluetooth Discoverability.
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the defaul - 120 secs.

Change-Id: Ife1bc803587ba975bb103a5ba7629d4a382cd705
2011-02-01 19:58:29 -08:00
Chris Wren
1b0489cb3e Allow users to change the length of Bluetooth discoverability to
be two minues, five minutes, an hour, or forever discoverable.

This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
2011-02-01 16:25:44 -08:00
Jake Hamby
a6d9fce2e1 Don't display extra A2DP profile icon for OPP.
The getDrawableResource() method for OppProfileManager was returning
the resource ID for the A2DP icon. This was causing an extra headset
icon to be drawn for devices supporting OPP, when no icon should be
shown for this profile. Changed to return 0.

Bug: 3368197
Change-Id: Idcadaf59fe53301544cda215ca24f15608b2d727
2011-01-27 20:32:21 -08:00
Jake Hamby
3d1fd57e30 Increase size of BT profile icons and decrease alpha for inactive profiles
Increase the size of the Bluetooth profile icons from 20dp to 30dp.
Decrease the alpha for disabled profile icons to 50% of theme default.

Bug: 3400851
Change-Id: Ieb5ecb01ccbd7185d383828e0d9c9f78525ee0c4
2011-01-27 18:33:17 -08:00
Jake Hamby
632a10f470 Fix settings NPE crash on launch.
Sometimes when the settings app is resumed, HeadsetProfileManager's
getConnectedDevices() method is called before the onServiceConnected()
callback gives us the proxy object, causing an NPE. Check that we
have the proxy object, and return an empty list otherwise. The
correct states will be shown in the UI because the
onServiceConnected() callback makes its own call to getConnectedDevices()
to set the correct headset profile state.

Bug: 3378431
Change-Id: I364ade0804fb2090378438c8721afef6cac2b0b8
2011-01-26 17:49:20 -08:00
Jake Hamby
1f5be05ee5 Merge "Implement "show received files" preference item." into honeycomb 2011-01-26 13:40:37 -08:00
Jake Hamby
4ee12032a3 Implement "show received files" preference item.
Add handler to send an intent to the Bluetooth OPP app to show the
list of received files to the user.

Bug: 3167219
Change-Id: I59e18559a0c35add7f1be56a5f040dae4dccc7f1
2011-01-26 10:51:32 -08:00
Amith Yamasani
b98c00e710 Update airplane mode checkbox when toggled from system bar.
Bug: 3148095

Also fix an NPE crash I saw when exiting Settings immediately after toggling
the airplane mode.

Change-Id: I83eb2d90e203fd56b09269cf9fa8f74a4354834f
2011-01-26 09:56:44 -08:00
Amith Yamasani
03b58dff82 Use expander assets for bluetooth profile preference.
Also adjust some padding and set correct highlight background.

Bug: 3383060
Change-Id: I5a4abe98c49efd156523085418958b69df6c8d85
2011-01-25 17:20:43 -08:00
Jake Hamby
51cd0d6d29 Remove "Allow incoming file transfers" option from BT settings.
The user preference to allow automatic incoming file transfers for
specific devices isn't implemented yet. Remove the preference from
the settings UI.

Bug: 3385941
Change-Id: Ib8fee9a0d99063a8c05d52a960664364e4812ace
2011-01-25 13:57:30 -08:00
Jake Hamby
cde015b3d4 Display correct HID icon for pointing and misc. devices
Added placeholder icons and code for non-keyboard HID devices.
ic_bt_pointing_hid.png - pointing device
ic_bt_misc_hid.png     - gamepad, remote control, card reader, etc.

Bug: 3137982
Change-Id: Iac7a53a6fbafa9c6ed794a29aa330da314d580d8
2011-01-19 15:24:39 -08:00
Jake Hamby
8140d9c916 Add icons for Bluetooth HID and PAN profiles.
Add icon resources for Bluetooth keyboard/mouse (HID profile)
and reverse tethering (PAN profile).

Bug: 3137982
Change-Id: Id6c4a9f2b4bee2fdf43626592e32070b49e49d73
2011-01-19 12:25:46 -08:00
Jake Hamby
2748fc24cf Close scan screen when pairing and remove device when unpairing.
Close the scan screen after successful pairing, and remove a
device from the list of paired devices after unpairing.

As part of the fix, BluetoothSettings was refactored into a parent
class, DeviceListPreferenceFragment, and three subclasses for each
variant type: BluetoothSettings, BluetoothFindNearby, and
DevicePickerFragment, replacing the checks against mScreenType with
custom logic in the child classes.

Bug: 3325848
Change-Id: If64fddc3ba5b4f1136451491c7d5a1139b696e47
2011-01-12 20:33:27 -08:00
Jake Hamby
55b7d27936 Only show "Allow incoming file transfer" option if device supports OPP
In the Bluetooth profiles settings screen for a device, the "Allow
incoming file transfer" item should only be shown if the device
supports the Object Push Profile.

Bug: 3297633
Change-Id: I4bbe66ef901feef9dd8a3916fb9827120c1fdfc0
2011-01-11 19:27:17 -08:00
Jake Hamby
055c20e576 Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb 2011-01-11 18:44:57 -08:00
Jake Hamby
c6e1b293a7 Don't throw exception on unexpected BT device addition.
Fix for reported bug where settings app crashes while trying to share
a picture. Bug report showed IllegalStateException thrown with message
"Got onDeviceAdded, but cachedDevice already exists." Changed code to
print an error message to the log and ignore the unexpected event,
rather than throwing an uncaught exception that crashes the app.

Bug: 2192884
Change-Id: I016be6a1616b317b2289768d18ae9f069a49445e
2011-01-11 13:27:50 -08:00
Jake Hamby
a0d39a39c2 Allow multiple simultaneous connections for BT input devices.
Move responsibility for disconnecting devices before connecting a new
profile from CachedBluetoothDevice to LocalBluetoothProfileManager.

The ProfileManager subclasses of LocalBluetoothProfileManager will
handle disconnecting the previously connected device, if necessary,
as part of connect(). The HID profile allows multiple simultaneous
connected devices, while the other supported profiles do not.

Bug: 3333975
Change-Id: Id51b26e64f7c3ee7d54af3a03ca82a669f305b52
2011-01-10 17:02:26 -08:00
Jake Hamby
4bd7cb0e07 Don't auto connect reverse tethering after pairing.
Added boolean param to connect() method in CachedBluetoothDevice
to specify whether to connect PAN profile. This is set to true when
the user clicks on a device in the paired devices list, but false
when auto connecting profiles after pairing and other circumstances.

Bug: 3330207
Change-Id: I6d8d50abb65a8cb24f87ad93c01693923991b6ef
2011-01-06 21:01:30 -08:00
Jaikumar Ganesh
da23ae88d1 Add new pairing dialog for keyboard pairings.
Change-Id: I672a3d874a7876fca6bd38091444dc9c5fb3a2f1
2011-01-06 13:38:09 -08:00
Jaikumar Ganesh
bf724587be Listen to Input device connection state intents.
Change-Id: I99addef820438c9c34bfccf2877578b06e14a00c
2011-01-04 13:35:53 -08:00
Jake Hamby
39ef225e7c Enable reverse tethering in BT settings screen.
- Enable support for reverse tethering in BT settings.
- Add string resource for "Auto connect" preference.
- Remove unused imports and other minor cleanups.
- Add isConnectable() and isAutoConnectable() methods to Profile
  enum type and remove isConnectableProfile() method.

Change-Id: Ie606db04028a8278e98231f0671a388671f2f067
2010-12-22 14:54:33 -08:00
Jake Hamby
3f0f998aa7 Remove Bluetooth tethering settings screen.
Remove obsolete Bluetooth tethering settings screen. BT tethering can
be turned on and off, but the connection must be initiated by the
remote device. For reverse tethering, there will be a checkbox for
that profile in the regular Bluetooth device settings screen.

Bug: 3283928
Change-Id: Ic25139f8862b305feb0381e61c24b7783fad2366
2010-12-14 13:40:10 -08:00
Jaikumar Ganesh
498d12bac0 Add ability to connect to only headset profile.
Fix some SDP records issues.

Change-Id: I42816527b1ae0749b4b59b7947f1acb9d2e6f001
2010-12-10 17:51:52 -08:00