diff options
| author | Jason Monk <jmonk@google.com> | 2015-02-04 13:00:55 -0500 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-03-02 10:40:21 -0500 |
| commit | be3c5dbee66758517a8198f98ed2e20c80af326b (patch) | |
| tree | 24cf7c862730a2f530710e9aaae33f52d932ee64 /packages/SettingsLib/res | |
| parent | c94ea96cb77b27d93e675912b2420bd43ae9b8fe (diff) | |
| download | frameworks_base-be3c5dbee66758517a8198f98ed2e20c80af326b.zip frameworks_base-be3c5dbee66758517a8198f98ed2e20c80af326b.tar.gz frameworks_base-be3c5dbee66758517a8198f98ed2e20c80af326b.tar.bz2 | |
Make QS use SettingsLib's BT code
A couple of changes needed to be made to SettingsLib to support this.
- SettingsLib needed to track ACTION_CONNECTION_STATE_CHANGED
- The summary code needed to move from Settings up into SettingsLib
- Added a getMaxConnectionState to CachedBluetoothDevice
- This simplifies the states of all of the profiles into
one.
Change-Id: I7f828f0038ad0cf39274986ece6d486d545f0286
Diffstat (limited to 'packages/SettingsLib/res')
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 870afeb..b5e49ce 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -76,6 +76,17 @@ <string name="bluetooth_connecting">Connecting\u2026</string> <!-- Bluetooth settings. Message when connected to a device. [CHAR LIMIT=40] --> <string name="bluetooth_connected">Connected</string> + <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing --> + <string name="bluetooth_pairing">Pairing\u2026</string> + + <!-- Bluetooth settings. Message when connected to a device, except for phone audio. [CHAR LIMIT=40] --> + <string name="bluetooth_connected_no_headset">Connected (no phone)</string> + <!-- Bluetooth settings. Message when connected to a device, except for media audio. [CHAR LIMIT=40] --> + <string name="bluetooth_connected_no_a2dp">Connected (no media)</string> + <!-- Bluetooth settings. Message when connected to a device, except for map. [CHAR LIMIT=40] --> + <string name="bluetooth_connected_no_map">Connected (no message access)</string> + <!-- Bluetooth settings. Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] --> + <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string> <!-- Bluetooth settings. The user-visible string that is used whenever referring to the A2DP profile. --> <string name="bluetooth_profile_a2dp">Media audio</string> |