summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importAbhisek Devkota2016-05-171-0/+2
| | | | Change-Id: I8bdc6dd49571e23e1797466ce76f15a6d0eab626
* Automatic translation importMichael Bestas2016-05-101-0/+2
| | | | Change-Id: Iab9f09f988de5b54b1145365268cb0de01526d79
* Partially revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0186-315/+918
| | | | | | | | | https://android.googlesource.com/platform/packages/apps/Bluetooth into cm-13.0" This reverts commit c2731fa898ec36edc24eb6316f7521896fdd59c2, reversing changes made to 14a2811d71fd98cd628e6e19bba2768e38934d99. Change-Id: Ib503192648ac768ee69adca4c5f5b1435dbe60d7
* Automatic translation importMichael Bestas2016-04-165-1/+139
| | | | Change-Id: I697f981458b148e53cd62a902f7c2dab1f293963
* Automatic translation importMichael Bestas2016-04-065-1/+138
| | | | Change-Id: I8ca05263e7935a11d9c8e01a1684d975871250d2
* Automatic translation importMichael Bestas2016-03-288-2/+214
| | | | Change-Id: Ic7609571856aa5d317ed2b69555cdf631e08b51b
* Automatic translation importMichael Bestas2016-03-1715-0/+41
| | | | Change-Id: I92136ed061bc4a08264846e7329f1a4d75c4f095
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-1187-918/+325
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Bluetooth into cm-13.0 Android 6.0.1 release 22 Change-Id: I78596c45a1d1d1a69f3fdfc5ede647e011b28e8f
| * Implement setting/getting whether audio can be routed to the HFP HF device.Bryce Lee2015-10-291-0/+2
| |\ | | | | | | | | | | | | | | | | | | am: 22bb394443 * commit '22bb39444356637fbcabd4acf04f2fdb9e3da177': Implement setting/getting whether audio can be routed to the HFP HF device.
| | * Implement setting/getting whether audio can be routed to the HFP HF device.Bryce Lee2015-10-281-0/+2
| | | | | | | | | | | | | | | Bug: 25332357 Change-Id: I2d37d082673255a165dad955aa1ca4b9f00d599e
| * | Revert "Allow HFP HF implementations to specify a client controller."Bryce Lee2015-10-291-3/+0
| |\| | | | | | | | | | | | | | | | | | | am: 84d1aab871 * commit '84d1aab871b03d94dddce4ad2d17f3c2acb892b5': Revert "Allow HFP HF implementations to specify a client controller."
| | * Revert "Allow HFP HF implementations to specify a client controller."Bryce Lee2015-10-291-3/+0
| | | | | | | | | | | | | | | | | | This reverts commit 8843d8a82571b0a2f1b003cad999bed595814257. Change-Id: I5371e263fd92c6790558d38f19945492731e17f6
| * | Allow HFP HF implementations to specify a client controller.Bryce Lee2015-10-291-0/+3
| |\| | | | | | | | | | | | | | | | | | | am: 8843d8a825 * commit '8843d8a82571b0a2f1b003cad999bed595814257': Allow HFP HF implementations to specify a client controller.
| | * Allow HFP HF implementations to specify a client controller.Bryce Lee2015-10-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The client controller service is used by the HeadsetClientService to determine conditions such as whether audio routing to device is permitted. Bug: 25332357 Change-Id: I8971960f959084ed3969db7c8cdef11673a58994
| * | Fix file permissions for Bluetooth share am: 66d643091eAjay Panicker2015-10-211-0/+3
| |\| | | | | | | | | | | | | | | | | | | am: 33e7f11a36 * commit '33e7f11a36a8553285a1fd4c3cfff1e9458df842': Fix file permissions for Bluetooth share
| | * Fix file permissions for Bluetooth shareAjay Panicker2015-10-211-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: 66d643091e * commit '66d643091edba75b4524483ea640273344533378': Fix file permissions for Bluetooth share
| * | | am 93793893: Read connection intervals from config.xml so it can be ↵Sharvil Nanavati2015-09-141-0/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | overriden by device. * commit '93793893b122e5eb3101899411fccaabc075dfaf': Read connection intervals from config.xml so it can be overriden by device.
| | * | Read connection intervals from config.xml so it can be overriden by device.Sharvil Nanavati2015-09-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wear needs the minimum possible connection interval for BLE connections to support the Wear iOS companion app. This change simply moves the hard- coded connection intervals to config.xml so they can be overriden for Wear devices. Bug: 23903184 Change-Id: I1f60772ef6a100ad5e4f02f629b5ca6e80fc207a
| * | | am e80da8a0: am 8f1def75: am 72ecb4ca: Make location enabled check ↵Sharvil Nanavati2015-08-201-0/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | configurable when returning scan results. * commit 'e80da8a027760b9daf3a431f620aff41d0673040': Make location enabled check configurable when returning scan results.
| | * | am 8f1def75: am 72ecb4ca: Make location enabled check configurable when ↵Sharvil Nanavati2015-08-201-0/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returning scan results. * commit '8f1def75a6f57a04fd0e8a6423343a690d694154': Make location enabled check configurable when returning scan results.
| * | | | am a5a0d23b: am 380bc78b: am e451efd4: Merge "Fix String alignment in BT ↵Sanket Padawe2015-07-151-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings in Hebrew locale." into mnc-dev * commit 'a5a0d23b7c5c7343d80250f6f2e95304ba832f4d': Fix String alignment in BT Settings in Hebrew locale.
| | * | | am 380bc78b: am e451efd4: Merge "Fix String alignment in BT Settings in ↵Sanket Padawe2015-07-151-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hebrew locale." into mnc-dev * commit '380bc78bdfb5c2245e758f5be1c193c94e6831e8': Fix String alignment in BT Settings in Hebrew locale.
| * | | | | am 57e5f8d7: am a7064181: am 2e311eab: Disable SAP profile by defaultAndre Eisenbach2015-07-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57e5f8d7aeaf650fea8746197f1f2ab88429dbe8': Disable SAP profile by default
| | * | | | am a7064181: am 2e311eab: Disable SAP profile by defaultAndre Eisenbach2015-07-131-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7064181673a5b7640c783f7b0f117cbba730ea4': Disable SAP profile by default
| * | | | | | am a933175c: Merge "Make string to plurals in BT inbound/outbound ↵Sanket Padawe2015-07-091-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification." into mnc-dev * commit 'a933175cbc1cdcbd0583642ba6eaf4555b3ed55c': Make string to plurals in BT inbound/outbound notification.
| * | | | | | am 7e850ddb: Merge "Make some BT screens RTL aligned in RTL context." into ↵Sanket Padawe2015-07-091-7/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '7e850ddbc6721f1f50fabb63b5dfe272b028ea92': Make some BT screens RTL aligned in RTL context.
| * \ \ \ \ \ \ am e1c46460: Merge "Locale based string alignment changes in BT." into mnc-devSanket Padawe2015-07-082-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e1c464601f1b1c0278551296cd7bdd50f96f4071': Locale based string alignment changes in BT.
| * \ \ \ \ \ \ \ am 690b14a7: Merge "Locale based string changes in BT." into mnc-devSanket Padawe2015-07-081-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '690b14a7fc9e3314b8ecdcc1b4bd219cc680078e': Locale based string changes in BT.
| * \ \ \ \ \ \ \ \ am cc61932a: Revert "Disable Bluetooth profiles that are not used on Clockwork."Andre Eisenbach2015-06-171-8/+8
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc61932a1cd785e6ba12798d64b548c90e09b69b': Revert "Disable Bluetooth profiles that are not used on Clockwork."
| * \ \ \ \ \ \ \ \ \ am c5348a52: am 29acf6cd: am 6675e069: Disable Bluetooth profiles that are ↵Sharvil Nanavati2015-06-161-8/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not used on Clockwork. * commit 'c5348a5259fddb9a801396e59189be072ed5a211': Disable Bluetooth profiles that are not used on Clockwork.
| * \ \ \ \ \ \ \ \ \ \ am 8c2499c4: Update Bluetooth app to use Material-themed dialogsAlan Viverette2015-05-291-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c2499c4262eea812abe8a525571e2a680c732c8': Update Bluetooth app to use Material-themed dialogs
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-03-05119-1/+3155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia50a7c3d36ba92aad8339dbac28b178505087ea4
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-02-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd9a19bab4e058ae48bc3695063f1d2c3e3260f3
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-02-143-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3df8456586f7f4bbc7c916bf259e44a5deaf21e3
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-02-026-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c7e13e8cbbdb4f427b2569b2a07b388829425a8
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-01-2519-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b7befddc6d353a294276fde4bef674f900601a1
* | | | | | | | | | | | | Automatic translation importMichael Bestas2016-01-1126-12/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e02362df5b0607c6839f0e84dccbb0307fe619f
* | | | | | | | | | | | | Improve AVRCP metadata stringMichael Bestas2016-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I317407521ffa36ceec727c3f30fcc5917f938270
* | | | | | | | | | | | | Automatic translation importMichael Bestas2015-12-2556-0/+1502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I810103dd2c4d0c84ddad311d5ac2885be9385784
* | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Bluetooth into HEAD Android 6.0.1 release 3 Change-Id: I3be439472d2eb426c5624267426bb7bb7bcbbf82
| * | | | | | | | | | | | Fix file permissions for Bluetooth shareAjay Panicker2015-10-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used a file provider to serve up URIs to allow applications to access files in the external Bluetooth directory. Bug: 23367919 Change-Id: Iadcdcafb235f3eeb50a0e147f3ef982fc9ee38b3
* | | | | | | | | | | | | Bluetooth: Move & improve caf stringsMichael Bestas2015-11-303-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie852ed4d7b9038f6b51d8ada58c3a562feb5e2c9
* | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-053-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Change-Id: I8ed32b53a80ccdf16ec9b75b1a7048fe48ddec78
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65c7851b505747cca3d79e899ac168f07520fa0a Auto-generated-cl: translation import
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-183-12/+12
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ebce88cb2ffc43352d10ab0a81874f87e4f2d48 Auto-generated-cl: translation import
| * | | | | | | | | | | am 72ecb4ca: Make location enabled check configurable when returning scan ↵Sharvil Nanavati2015-08-201-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | results. * commit '72ecb4caa630b63f66505ccb202a807b1af4e294': Make location enabled check configurable when returning scan results.
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31cda5f4892ecf86a9c9119562f73932f163b8f1 Auto-generated-cl: translation import
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1577-153/+661
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07844963f015fa6086c69b1251030b02e5abeb2b Auto-generated-cl: translation import
| * | | | | | | | | | | am e451efd4: Merge "Fix String alignment in BT Settings in Hebrew locale." ↵Sanket Padawe2015-07-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit 'e451efd492dba5cb252faeff8f7fe6e1b5ba0fdc': Fix String alignment in BT Settings in Hebrew locale.
| * | | | | | | | | | | am 2e311eab: Disable SAP profile by defaultAndre Eisenbach2015-07-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2e311eabf558760b5ee04f50e5ad2adee9d68ff9': Disable SAP profile by default