Commit Graph

290 Commits

Author SHA1 Message Date
Swaminatha Balaji
00ec05985d Auto connect hf/a2dp when any one of them gets connected and timeout happens
Change-Id: I6249c2fceab87f91c6629d19f72268d000ecf61c
2012-07-16 15:38:37 -07:00
fredc
654a3ab77d Fixed settings crash fix when profile is connected, Bluetooth turned off/of and phone is rebooted
Change-Id: I8738569c24a3c6cc9166b38719c1e918d990242c
2012-07-16 15:38:37 -07:00
Swaminatha Balaji
2ac143fff7 Auto connect hf/a2dp
Change-Id: I4cb260a1f794c2e094a0b19bdc1df919c4287232
2012-07-16 15:38:37 -07:00
fredc
83b0d575dd Fixed issue with Settings app crashing after turning on/off and clicking unpair
Change-Id: Icc7667cea62251074ae38aa2d650c88a51d8eab6
2012-07-16 15:38:37 -07:00
Srikanth Uppala
4bb010a67f add discoverability timoeut when set by 3rd party app
Change-Id: Ibfd358121f8f9fbbf3b9bc06c5be7b9300e0ba53
2012-07-16 15:38:37 -07:00
Srikanth Uppala
59a97f7a73 Fix discoverability timeout issues. (a) implement timeout logic (b) persist 'never timeout' after reboot (c) code cleanup
Change-Id: Ia7a8611d7212b9201994034d17da1d18e106107b
2012-07-16 15:38:37 -07:00
Harish Paryani
4e1876a40a Disconnect before Unpair 2012-07-16 15:38:37 -07:00
Justin Koh
f7077e3614 am 519dda9c: Disables BluetoothPairingDialog if in appliance mode.
* commit '519dda9c572309182cb29e247adafe2cd475a594':
  Disables BluetoothPairingDialog if in appliance mode.
2012-05-01 12:37:27 -07:00
Justin Koh
519dda9c57 Disables BluetoothPairingDialog if in appliance mode.
Disables the BluetoothPairingDialog if we are in appliance mode.

Bug: 6392817

TESTED = runs on Tungsten.

Change-Id: I62191496b412c6196e9a18a1dd1d3bc3dd70ba0c
2012-04-30 18:08:19 -07:00
Amith Yamasani
b0b37ae21c Help menus for several screens.
Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
2012-04-23 15:35:36 -07:00
Mike Lockwood
cd2fc47389 Merge commit '50339f3'
turn off log spew

Change-Id: I1bd25f3954497557762fda0ebea64bc21031eef7
2012-03-21 16:12:27 -07:00
Jake Hamby
a9534367b5 Fix IME soft keyboard for Bluetooth rename device dialog.
The soft keyboard should automatically pop up when the user selects
the Bluetooth rename device menu item. Fixed by calling
setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE) on the Window
containing the AlertDialog before showing.

The device name field should also be a single line field, with the
Done button causing the device to be renamed. Set the "singleLine"
attribute in the layout XML to true, and added a
TextView.OnEditorActionListener to set the device name and dismiss
the dialog for EditorInfo.IME_ACTION_DONE.

Bug: 5342542
Bug: 5343354
Change-Id: I550d8e9a59395ad66f8a9c11d29c0f2ef278c196
2012-03-13 20:08:22 -07:00
Amith Yamasani
6130420fa9 am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
2012-02-28 10:14:08 -08:00
Amith Yamasani
9372484065 Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Bug: 6079494

(cherry picked from commit 5fb53f36cb)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
2012-02-28 09:58:45 -08:00
Joe Onorato
50339f3da1 turn off log spew
Change-Id: I10f70d5f173cb04e9f58434d9daf0bb01498b813
2012-02-27 22:32:43 -08:00
Amith Yamasani
5fb53f36cb Don't crash if there's no bluetooth functionality (such as in an emulator)
Bug: 6079494
Change-Id: I12f729134407eaa719dc6a25e89a3b48476985e2
2012-02-27 17:18:45 -08:00
Mike J. Chen
31c5ec8202 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: Ib76a26d440ede34cc8a41ffc8b680ca2b20b38ca
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-02-10 15:29:44 -08:00
Jeff Brown
48c1d78c2f am 81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit '81dfecf8ba6a603fd8974640517966c3a8930be3':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
2011-11-09 18:58:59 +00:00
Jeff Brown
b8dd637887 Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug: 5569662

Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba
2011-11-08 14:32:29 -08:00
Ed Heyl
a762e1d708 Merge remote branch 'goog/ics-mr1' into ics-aah 2011-10-31 05:54:48 -07:00
Jaikumar Ganesh
f5754a078c Fix UI issue with Bluetooth Settings.
When a profile fails to connect, the preference was getting unset.

Patch generated in conversation with Jake Hamby.

Bug: 5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
2011-10-27 16:39:50 -07:00
Mike J. Chen
ef4eb89d71 Allows auto dismissing of bluetooth activation dialogs
Create a new overlay boolean that allows products (like Android@Home
ones that have no or minimal display) to not bring up the bluetooth
activation confirmation dialog.

Change-Id: I23c2d1483a4d71b0025624c2e4aaacc688de3260
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-10-27 17:39:54 -04:00
Jake Hamby
de53b46b16 BT device picker: don't rescan after rotating the device
The Bluetooth device picker was restarting the device scan after
the screen is rotated. Fix this by only starting the scan when the
savedInstanceState Bundle passed to onCreate() is null.

Also removes "No Bluetooth devices were found nearby" from list if
the user switches to a different app and then switches back to
the device picker.

Bug: 5249380
Change-Id: I8959c850649eb713fb930ee0a8a7bcb73ca7c1aa
2011-09-06 18:35:08 -07:00
Jake Hamby
9a4543e1de Fix unresponsive UI during scan and display of "No Bluetooth devices"
- When there are no available Bluetooth devices, we show
  "No Bluetooth devices were found nearby" as a preference item after
  the scan completes. Update the layout for this Preference item so
  that the text is centered and doesn't highlight when touched.

- Fix slow responsiveness on scanning caused by repeated removal of
  "No Bluetooth devices were found" preference item on every call to
  onBindView().

- If no devices are paired, don't restart the scan on every rotation.

Bug: 5173935
Bug: 5055460
Change-Id: I52fb2d52f315c5e793f08499146842d54c5c3ead
2011-08-31 17:18:36 -07:00
jhtop.kim
8abbaab8b3 Bluetooth : fix for showing paired device list error
- Pair one devie, then turn off BT then reboot the phone
  and enter Bluetooth settings screen and turn on BT.
  The last paired device will not be displayed in paired list.
- After onResume() is called, the list is shown.

- The reason is that mDevicePreferenceMap is not empty. The paired
  devices are cached when BT is off and then skipped when BT is
  turned on and updateContent() is called again.
- Make the mDevicePreferenceMap clear when updateContent() is called
  and adapter state is BluetoothAdapter.STATE_ON.

Change-Id: Ia745e02bcb4e21a54ccc8477a4dfbad1fa5aed17
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-25 11:42:38 -07:00
jhtop.kim
d66b61908d Bluetooth : fix for unnecessary device-scan starting
- When trying to pair with any device, if bond state changes
  device scan will be started automatically.

- add some flag to check proper scan time and to prevent unnecessary device scanning.

Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>

Change-Id: I4977ec122105f33cdd25a4f5c9fed59dda916379
2011-08-24 15:31:40 -07:00
Matthew Xie
92f92b5449 Merge "Remember user choice for phone book access permission dialog" 2011-08-18 17:12:33 -07:00
Matthew Xie
b707255a44 Remember user choice for phone book access permission dialog
Change the always-allowed checkbox to be don't-ask-again checkbox to remember
user's decision so that user will not be bothered agian if he/she checks
the don't-ask-again checkbox
bug 5099661

Change-Id: If32ab8e93313bbd33ff040553083f0cf9359b69e
2011-08-18 16:31:30 -07:00
Jeff Sharkey
dcf8ba9eb2 Follow preferences padding changes in framework.
Change-Id: Ia83237290da035e5ee7a2e92ef56fc02838aac56
2011-08-16 16:37:49 -07:00
jhtop.kim
e96f04c1ff Bluetooth : fix for Settings crashes while rotating the screen.
- Add some codes preventing setting crash when rotating the screen
  when the Rename device or Visibility timeout dialogs are visible.

Change-Id: I5e142a5d869a0d5c91c6ace80093d09178d79558
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-15 15:14:58 -07:00
Jake Hamby
12294f893d Merge "Bluetooth : fix for unexpected discovery summary string changing" 2011-08-09 13:29:25 -07:00
jhtop.kim
1ecee6c100 Bluetooth : fix for unexpected discovery summary string changing
- While Visibility timeout setting is never,
  the summary string "Visible to all nearby Bluetooth devices" is shown.
  but if rotating screen or unpairing, pairing actions make the summary
  be changed "Not visible to other Bluetooth devices" or
  "Only visible to paired devices"
- call handleModeChanged() to refresh summary state.

Change-Id: I4b324f2a9530e5e4ca4571f3dd47e8992bdae0cb
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-08 15:46:44 -07:00
jhtop.kim
aaf8ffff79 Bluetooth : fix for handling back key during pair dialog display
- Pressing back key when pairing dialog appears infront , device shows "Pairing..."
  if we don't have any bonded device in device list.
- when press back key will perform onCancel() operation.

Change-Id: Iacd654efad455f17a5c3bb09f822d9af5a7aed7d
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-08 15:21:12 -07:00
Jake Hamby
79be0b3e6b Fix multiple BT settings bugs.
- Change Bluetooth profiles screen to match ICS wireframes
- Remove BluetoothProfilePreference.java (no longer used)
- Remove "Pair with this device" summary below every unpaired device
- Remove "Paired but not connected" summary below unconnected paired devices
- Fix auto connection after pairing (reuse existing CachedBluetoothDevice)
- Add "Connected (no phone/media)" summaries based on ICS wireframes
- Fix visibility timeout strings.
- Fix crash when starting Bluetooth from Settings shortcut widget.

Bug: 5064139
Bug: 5064324
Bug: 5080404
Bug: 5093513
Bug: 5104485
Change-Id: Ie87103e183ce414c86cb1831a38ef0178b1b1292
2011-08-03 17:55:27 -07:00
Matthew Xie
2036ebd889 Save changed name from CachedBluetoothDevice to native storage
The change preserves the friendly name change over power cycle.
bug 5081605

Change-Id: I2b2cce5a789c72d52439511c42df369639eb0b4b
2011-07-27 17:35:48 -07:00
Jake Hamby
2837fbbe15 Merge "Bluetooth : fix for crashing alertDialogbox" 2011-07-25 17:21:58 -07:00
jhtop.kim
bb16e15de3 Bluetooth : fix for crashing alertDialogbox
- changes for crashing of alertDialogbox while displaying message
- in showError function, this fix code shoud be added in case of showing error pop up

Bug: 5068089
Change-Id: I40e8a699461832b7bd47080b40f467572632d412
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-07-25 16:22:43 -07:00
Jake Hamby
49cfe8a3c8 Fix some Bluetooth settings bugs.
- Remove BluetoothFindNearby.java (no longer used)
- Show message when Bluetooth is turning off
- Fix case where device name sometimes didn't show when turning BT on
- Disable "Rename device" and "Visibility timeout" menus when BT is off
- Remove "Got onDeviceAdded, but cachedDevice already exists" log message
- Never show "Rename device" in action menu (bug 5064378)
- Show discovery time remaining as "m:ss", not "mm:ss" (bug 5064104)

Bug: 5064378
Bug: 5064104
Change-Id: I79609dfdad61993a28cff64c9e082870ff74d180
2011-07-25 14:57:07 -07:00
jhtop.kim
298365bbf3 Bluetooth : Fix for changing the BT device icon if the calss is null (mouse)
- mouse is displayed as keyboard. if class is null, default icon is keyboard in hid profile

Change-Id: I2ff928ce1032d8eb492d81fff2e7fb218970b768
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-07-18 15:54:14 -07:00
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