summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/bluetooth
Commit message (Collapse)AuthorAgeFilesLines
* Correctly remember MAP access selection.Danny Baumann2013-04-033-37/+62
| | | | | | | | | Previously, the MAP access notification used to pop up on every BT connection. 'Don't ask this again' didn't work. Fix that by correctly remembering not only the PBAP access selection, but also the MAP access selection. Change-Id: I8fb9bedc02f696c9247861eb57ad64c4a8f5f6fa
* Merge commit 'android-4.2.2_r1' into mr1.1-stagingRicardo Cerqueira2013-02-153-29/+30
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: AndroidManifest.xml res/values-de/strings.xml res/values-el/strings.xml res/values-es/strings.xml res/values-fi/strings.xml res/values-hu/strings.xml res/values-it/strings.xml res/values-iw/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-zh-rCN/strings.xml res/values/strings.xml src/com/android/settings/ChooseLockGeneric.java src/com/android/settings/ChooseLockPatternTutorial.java src/com/android/settings/DeviceInfoSettings.java src/com/android/settings/Settings.java Change-Id: I275be467a401ad6dcc7966924358a5adb0773b75
| * Fix Bluetooth enable dialog to match Android style guide.Jake Hamby2012-11-202-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | When an app requests to enable Bluetooth and/or Bluetooth discovery, we show a dialog for user confirmation. Remove the dialog title, update the message text and button labels to be more descriptive, and use the standard dialog layout instead of a custom layout. Also fixes the button layout on the Bluetooth permission test app so that the "Discoverable" button doesn't wrap to two lines. Bug: 6001468 Change-Id: I731e2f31b4c822395fc3f83584a092550d9ae7d3
| * fix dock audio enable dialogEric Laurent2012-11-121-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | The dock audio enable setting is not saved if the user dismisses the dialog without checking or unchecking the check box. The dialog is then displayed each time the device is docked until the user checks/unchecks the dialog or goes to sound settings to enable or disable dock audio. Bug 7518165. Change-Id: Ifbc6179e78b64b5b7577ac750acf9846525e47c5
* | Bluetooth MAP (Message Access Profile) Upstream Changes (2/3)Corey Garst2013-01-201-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PORTED FROM CM10: http://review.cyanogenmod.org/#/c/26393/ Incorporates updates to the Bluetooth MAP profile from Code Aurora's Android Enablement Project since we initially pulled in from their gingerbread to CM7 last year. This patch addresses bugs with the current MAP profile, adds a UI request for message access approval when pairing, and adds additional error checking and logging. Confirmed to fix date and "Download" function of Ford SYNC Gen1. Pulled in from the codeaurora jb branch. Change-Id: Ie35067f389ced8e86433a991776b4a8e1f1ce963
* | Settings: RTL layout fixesOr Harambam2013-01-191-1/+1
|/ | | | | | | | | | Replaced Left with Start, and Right with End to fit Google's new RTL API. Replaced setPadding with setPaddingRelative (which uses Start and End instead of Left and Right) around switches to make them look right in RTL UIs Added RTL Support to LinearColorBar in order to make App Management's storageBar compatible with the RTL UI. Reversed App Management's ViewPager in RTL langs Fastscroll aligned to the left Change-Id: I495f4794a9861fa01692d766ef86f4fdd8e4b38d
* display audio dialog when connecting low end dockEric Laurent2012-10-302-74/+122
| | | | | | | | | | | | | Display a dialog to enable the use of the dock audio connection when a low end dock is connected for the first time. Modify DockService to process docked and undocked messages even if the device indicated is null (meaning the dock is not a bluetooth dock) only for low end docks. Bug 7302106. Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
* Merge "More migration to Global settings." into jb-mr1-devJeff Sharkey2012-10-181-1/+1
|\
| * More migration to Global settings.Jeff Sharkey2012-10-181-1/+1
| | | | | | | | | | Bug: 7375796 Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
| * Revert "bluetooth won't turn on after turn Airplane mode off on setting ↵Irfan Sheriff2012-10-171-32/+10
| | | | | | | | | | | | | | | | | | screen on manta(tablet)" This reverts commit 0b21b3d725935c03a4ca4ab8476da2b0675a53cd. Bug: 7366814 Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
| * bluetooth won't turn on after turn Airplane mode off on setting screen on ↵Zhihai Xu2012-10-171-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manta(tablet) The root cause is normally when change the airplane mode, the bluetooth setting UI will not be foreground. No listener is setup for bluetooth setting UI when it is in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled won't be called. But for manta, airplane mode setting and bluetooth setting UI both will show on the foreground due to bigger screen size. When we turn ariplane mode on, bluetooth manager service will disable bluetooth without changing the persist bluetooth setting. But bluetooth setting UI will listen to the bluetooth state change intent, it will receive bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged, which cause checked status changed from true to false to trigger the listener (onCheckedChanged) being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true) to change bluetooth persist state to OFF. So when we turn back airplane more to OFF, due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON. bug 7366814 Change-Id: I07d4a2dfe03fc6775cfeabb28cd3a0cc1fded44e
* | bluetooth won't turn on after turn Airplane mode off on setting screen on ↵Zhihai Xu2012-10-181-6/+25
|/ | | | | | | | | | | | | | | | | | | | | | manta(tablet) The root cause is normally when change the airplane mode, the bluetooth setting UI will not be foreground. No listener is setup for bluetooth setting UI when it is in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled won't be called. But for manta, airplane mode setting and bluetooth setting UI both will show on the foreground due to bigger screen size. When we turn ariplane mode on, bluetooth manager service will disable bluetooth without changing the persist bluetooth setting. But bluetooth setting UI will listen to the bluetooth state change intent, it will receive bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged, which cause checked status changed from true to false to trigger the listener (onCheckedChanged) being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true) to change bluetooth persist state to OFF. So when we turn back airplane more to OFF, due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON. Don't need to consider thread synchronization, because everything is running on the main thread. bug 7366814 Change-Id: I138d1904df6cb17c7828295caa51a7d80abf99f2
* Allow disconnected BT profiles to be unchecked in Settings.Jake Hamby2012-10-042-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | In the Bluetooth profile list, the checkbox indicates whether the profile is preferred (we should auto connect). If the profile is not connected, selecting it will try to connect the profile and set it to preferred. If the profile can't be connected, then the user could not turn off the preferred setting for the profile. Change the behavior so that when a profile is not connected, but is marked as preferred, selecting the profile will turn off the preferred setting (no auto connect) instead of trying to connect. This enables the user to turn off auto connect for a profile when it can't be connected. Tapping a second time will try to connect the profile and set it as preferred, as usual. Also change PanProfile to return the current connection status for isPreferred() instead of always returning true. Currently, the PAN profile is always checked, which is confusing because it looks like PAN is always connected. Also, because of the new behavior when a profile is selected, it's now necessary to return false for isPreferred() when PAN isn't connected, so that we will try to connect when the user selects it, instead of trying to turn off the preferred setting, which isn't supported for PAN. Bug: 7007641 Change-Id: Ifb0f51a15379bc254933168c43bdfc8b22f26051
* Fix regression in Bluetooth settings.Jeff Brown2012-09-243-4/+32
| | | | | Bug: 7207090 Change-Id: Ie14a1d36a61b571766d2025ed7d8079712727690
* First draft of wifi display settings UI.Jeff Brown2012-09-191-1/+2
| | | | | | | | All of the functionality is in place but the UI is not fully polished yet. Bug: 7178216 Change-Id: Id76843bff05cc71e5c02a31bc97c7070d58fff10
* Rename file to satisfy strict Java requirementAndy Stadler2012-09-181-1/+1
| | | | | | | | | There is no code change, the classname is OK, it was just the filename that needed a tweak. Original code was Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4 Change-Id: I14f2009cff186647a736b1183acf815713234dd5
* am 206f87c5: am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" ↵Matthew Xie2012-09-101-1/+8
|\ | | | | | | | | | | | | into jb-mr1-dev * commit '206f87c5b99c5653b83ba55682ab4dd622fbfe6c': Fix NPE in bluetooth Permission Activity
| * Fix NPE in bluetooth Permission ActivityGanesh Ganapathi Batta2012-09-101-1/+8
| | | | | | | | | | | | | | | | | | This fixes a NPE by ensuring that cached device list has a cached device associated with a given BDA before accessing the cached device Bug:5964529 Change-Id: Ib2c3596e6e008c78f9f1137134e421ca710e1217
* | am 0aeb8f2e: am 952146ee: Merge "Clear profile connnection status of bonded ↵Matthew Xie2012-09-042-0/+20
|\ \ | |/ | | | | | | | | | | devices when BT is turned off" into jb-mr1-dev * commit '0aeb8f2ee1fcdaaf624e38a4abef47a1a5909b95': Clear profile connnection status of bonded devices when BT is turned off
| * Clear profile connnection status of bonded devices when BT is turned offGanesh Ganapathi Batta2012-09-042-0/+20
| | | | | | | | | | | | | | | | | | | | | | When BT is turned off in mid of a profile connection, sometimes profile connection status change message with status= DISCONNECTED does not reach Settings app which results in stale connection status for the device when BT is enabled next time. Fixed the issue By explicitly clearing the connection status for all paired devices when BT is turning OFF Change-Id: I5d0c158636f3b62eff9094821abe2ef3a7cab16e
* | am 463b501e: am 9e8e9a17: am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS ↵Jean-Baptiste Queru2012-08-131-1/+1
|\ \ | |/ | | | | | | | | | | alert drawable" * commit '463b501e6c50fb2312e83b520147af41b253dd8f': Settings: Use ICS alert drawable
| * am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"Jean-Baptiste Queru2012-08-131-1/+1
| |\ | | | | | | | | | | | | * commit '6fb425e2805a1c27c048fc954d402f4612cbf74d': Settings: Use ICS alert drawable
| | * Merge "Settings: Use ICS alert drawable"Jean-Baptiste Queru2012-08-131-1/+1
| | |\
| | | * Settings: Use ICS alert drawableBjörn Lundén2012-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Point to the correct holo alert drawable. Change-Id: Ia15aaa028c8371cb2478baeecd2da31520c43a5d
* | | | am 83457dd7: am a1f463cb: Merge "Remove Profile Auto connection specific ↵Matthew Xie2012-08-0810-262/+165
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | logic" into jb-mr1-dev * commit '83457dd79bb481afe9a1ad16259802b0a09fe68a': Remove Profile Auto connection specific logic
| * | | Remove Profile Auto connection specific logicGanesh Ganapathi Batta2012-08-0610-262/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove profile auto connection specific logic as it is not implemented in Bluetooth app Disconnect PBAP server connection when user initiates device level disconnection Change-Id: I381ed96f6b57f414bbaccd694f55d2b992e330a4
* | | | am 8756c500: am 9effd146: Merge "Fix for correctly enabling PAN profile in ↵Matthew Xie2012-08-062-4/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP i * commit '8756c500a1aa22b9b81eeeb7f25ec7246a1c1464': Fix for correctly enabling PAN profile in Settings Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now, the DeviceProfileSettings screens displays valid 'Internet connection sharing' option when connected as a NAP to remote PANU.
| * | | Fix for correctly enabling PAN profile in SettingsSyed Ibrahim M2012-08-012-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the connected profile list in CachedBluetoothDevice correctly if a PANU-NAP connection is already existing but the onUuidChanged() callback doesnt contain the PANU UUID in SDP inquiry. Now, the DeviceProfileSettings screens displays valid 'Internet connection sharing' option when connected as a NAP to remote PANU. Change-Id: I35821233e7776fb13f7fb1eb22af992b497202a9
* | | | am 7b065464: Move BT settings appliance check after foreground check.Justin Koh2012-08-011-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * commit '7b065464c996b792c1ecdd9d8c93db1bf0538b8d': Move BT settings appliance check after foreground check.
| * | | Move BT settings appliance check after foreground check.Justin Koh2012-07-311-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the BT settings appliance check after the foreground activity check. This allows us to pair bt devices if we have a UI hooked up instead of never allowing it. TESTED = runs on Nexus Q. Change-Id: I3c1ea4abb8d05236d91d2525934bec757cc5ca88
* | | | Reset the priority on unbondRavi Nagarajan2012-08-017-0/+37
| | | | | | | | | | | | | | | | Change-Id: I67b68bd70b947177218e0b908b79ebb9de9f45a8
* | | | Fix for When Hf is rejected the device should initiate A2dp if a2dp is enabledSwaminatha Balaji2012-08-012-0/+49
| | | | | | | | | | | | | | | | Change-Id: I0716782a5308cc45297a30d0a7371286c75bfa52
* | | | Add dev to cached dev list if entry is missing before auto connectGanesh Ganapathi Batta2012-08-011-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fix for BLTH01482218 Change-Id: I7d5cfad3eff872b5eb0b0c71804f25f3c3334557
* | | | Make Settings app aware of layout directionFabrice Di Meglio2012-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi) Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
* | | | Clean up codes, fix long lines, improve readability, etcMatthew Xie2012-07-165-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | Update copyright date, remove unused variable, import Change-Id: I731c48c8e5b16cbee5230f1d02109f249b8bab5d
* | | | On an incoming pairing of a newly paired device, setPreferred of theKausik Sinnaswamy2012-07-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | profiles needs to be called to enable incoming/outgoing connections Change-Id: Ic90e4857fb119e31639e4a50db48b084201aadb2
* | | | Fixed a race condition during pairing with carkits wherein connect wasKausik Sinnaswamy2012-07-161-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | issued even before ACTION.uuid changed was received. Change-Id: Iafc2c61b92537a219e46e08366fab1ad5f4e97bd
* | | | On bluetooth disable, delete all devices that are not bondedRavi Nagarajan2012-07-161-1/+1
| | | | | | | | | | | | | | | | Change-Id: If66d54eb4d953c4cc78a22a8b3e89e42bc16f5f4
* | | | Fix to update the checkbox attribute values after connect() is called; This ↵Syed Ibrahim M2012-07-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | is to make sure for profiles like HID where re-connection can happen only from the device side, the UI is updated to be in sync with the right priority of the corresponding profiles Change-Id: I4a17d8bbf584e6e64519fe3508bccd5d167a020d
* | | | Revert "Changes done to update UI with appropriate checkbox state, when AVRC ↵Kausik Sinnaswamy2012-07-162-7/+3
| | | | | | | | | | | | | | | | | | | | Connect is initiated from the headset. Earlier, the checkbox state was not being updated when the connection state changed for media audio, when connected from headset" This reverts commit 2f9d962940cb92c7f70576a29f263258f6abc478
* | | | Headset connection status is displayed incorrectly, as the boolean ↵Ravi Nagarajan2012-07-161-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | mIsProfileReady is not initalized properly. Make sure mIsProfileReady is initialized always when onServiceConnected is received Change-Id: I968ce6900121a6140256b3181c792d421bdb7cf6
* | | | Fixed null pointer exception when BT is enabled from settings screen with ↵fredc2012-07-164-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | previously bonded devices Change-Id: Ia0cf763920fd99897994ea15445aec1dcd48853e
* | | | Changes done to update UI with appropriate checkbox state, when AVRC Connect ↵Sreenidhi T2012-07-162-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is initiated from the headset. Earlier, the checkbox state was not being updated when the connection state changed for media audio, when connected from headset Change-Id: Ic46a8a87b74cbe76f0e8b62428516af5594526ec
* | | | Clear the Available (unbonded devices) from the CachedDevices ListKausik Sinnaswamy2012-07-162-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | during BT disable. Change-Id: I576237a4165759fe952690f19fde59ce78cd1d29
* | | | Auto connect hf/a2dp when any one of them gets connected and timeout happensSwaminatha Balaji2012-07-163-9/+79
| | | | | | | | | | | | | | | | Change-Id: I6249c2fceab87f91c6629d19f72268d000ecf61c
* | | | Fixed settings crash fix when profile is connected, Bluetooth turned off/of ↵fredc2012-07-164-26/+99
| | | | | | | | | | | | | | | | | | | | | | | | and phone is rebooted Change-Id: I8738569c24a3c6cc9166b38719c1e918d990242c
* | | | Auto connect hf/a2dpSwaminatha Balaji2012-07-164-3/+109
| | | | | | | | | | | | | | | | Change-Id: I4cb260a1f794c2e094a0b19bdc1df919c4287232
* | | | Fixed issue with Settings app crashing after turning on/off and clicking unpairfredc2012-07-161-2/+1
| | | | | | | | | | | | | | | | Change-Id: Icc7667cea62251074ae38aa2d650c88a51d8eab6
* | | | add discoverability timoeut when set by 3rd party appSrikanth Uppala2012-07-163-41/+53
| | | | | | | | | | | | | | | | Change-Id: Ibfd358121f8f9fbbf3b9bc06c5be7b9300e0ba53
* | | | Fix discoverability timeout issues. (a) implement timeout logic (b) persist ↵Srikanth Uppala2012-07-162-2/+90
| | | | | | | | | | | | | | | | | | | | | | | | 'never timeout' after reboot (c) code cleanup Change-Id: Ia7a8611d7212b9201994034d17da1d18e106107b