diff options
| author | Joseph Pirozzo <pirozzoj@google.com> | 2020-03-19 17:54:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-19 17:54:22 +0000 |
| commit | 360a06de6878ed38fa2ebf973843140e3b3920ab (patch) | |
| tree | e4b6c2c9034192a6d907aceb791182967f385ca1 /res | |
| parent | 1b580b3a928781b087bfbaef4caa80041d038f9d (diff) | |
| parent | 0c5249af8f81b0b9aac51cc233914b1649c5f000 (diff) | |
| download | android_packages_apps_Bluetooth-360a06de6878ed38fa2ebf973843140e3b3920ab.tar.gz android_packages_apps_Bluetooth-360a06de6878ed38fa2ebf973843140e3b3920ab.tar.bz2 android_packages_apps_Bluetooth-360a06de6878ed38fa2ebf973843140e3b3920ab.zip | |
Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-dev
* changes:
Return an empty list when the requested node is not in the tree
AvrcpController Test update
AVRCP Controller Media Controller not ready
Allow subsequent requests for media keys to replay the silent audio sample
HFP Client call status update
PBAP server, send favorite contacts
AVRCP Controller Disable Automatic Focus Request
A2DP Sink: Focus gain while transient loss
AVRCP Controller State without Browsing
Add bluetooth prefs for Android Automotive
MAP Client disconnect state machine if MAS client disconnected
MAP Client close connection on MNS disconnect
MAP Client Only connect MNS in connected state
MAP Client BMessage parser length
MAP Client support incomming MMS
PBAP client, download favorite contacts
AVRCP MediaBrowserService support ACTION_PREPARE
AVRCP Controller onSkipToQueueItem invalid
AVRCP Controller getCurrentCalls NPE
AVRCP Controller transient loss while idle
AVRCP Controller request focus when idle
AVRCP Controller AbsoluteVolumeNotification
Splitting over-the-air downloading into batches
Use Calendar.Builder for MAP Client timestamp parsing
AVRCP Controller Shuffle/Repeat support
Broadcast MAP Client messages oldest first
DO NOT MERGE: Revert "AVRCP Controller AbsoluteVolumeNotification"
DO NOT MERGE: Revert "AVRCP Controller transient loss while idle" This revert is reapplied after a few CLs to match change order to AOSP.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 1389e0d35..0204f9830 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -249,4 +249,5 @@ <string name="bluetooth_disconnected">Bluetooth audio disconnected"</string> <string name="a2dp_sink_mbs_label">Bluetooth Audio</string> <string name="bluetooth_opp_file_limit_exceeded">Files bigger than 4GB cannot be transferred</string> + <string name="bluetooth_connect_action">Connect to Bluetooth</string> </resources> |