diff options
| author | 2017-04-10 22:47:54 +0000 | |
|---|---|---|
| committer | 2017-04-10 22:47:56 +0000 | |
| commit | 1da38b2bcdddb61b8eb9cd76d57f484066a66ba5 (patch) | |
| tree | 9fd1a64016610bc3e14a8e509fca7ea6d26213ba | |
| parent | c4ea961f9179d268b9851ee2bac0c07c77956dcc (diff) | |
| parent | e86bdcaed1372aa05bdfba175007b05613aecd9b (diff) | |
Merge "Add developer setting and system API for inband ringing support"
| -rw-r--r-- | core/java/android/bluetooth/BluetoothHeadset.java | 12 | ||||
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index f46a3b3c733a..2d25659bd773 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -1010,6 +1010,18 @@ public final class BluetoothHeadset implements BluetoothProfile { } /** + * check if in-band ringing is supported for this platform. + * + * @return true if in-band ringing is supported + * false if in-band ringing is not supported + * @hide + */ + public static boolean isInbandRingingSupported(Context context) { + return context.getResources().getBoolean( + com.android.internal.R.bool.config_bluetooth_hfp_inband_ringing_support); + } + + /** * Send Headset the BIND response from AG to report change in the status of the * HF indicators to the headset * diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index c51f872e49b5..adbcfe82acac 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -429,6 +429,8 @@ <string name="mobile_data_always_on">Cellular data always active</string> <!-- Setting Checkbox title for disabling Bluetooth absolute volume --> <string name="bluetooth_disable_absolute_volume">Disable absolute volume</string> + <!-- Setting Checkbox title for enabling Bluetooth inband ringing --> + <string name="bluetooth_enable_inband_ringing">Enable in-band ringing</string> <!-- UI debug setting: Select Bluetooth AVRCP Version --> <string name="bluetooth_select_avrcp_version_string">Bluetooth AVRCP Version</string> @@ -510,6 +512,9 @@ <string name="verify_apps_over_usb_summary">Check apps installed via ADB/ADT for harmful behavior.</string> <!-- Summary of checkbox for disabling Bluetooth absolute volume --> <string name="bluetooth_disable_absolute_volume_summary">Disables the Bluetooth absolute volume feature in case of volume issues with remote devices such as unacceptably loud volume or lack of control.</string> + <!-- Summary of checkbox for enabling Bluetooth inband ringing --> + <string name="bluetooth_enable_inband_ringing_summary">Allow ringtones on the phone to be played on Bluetooth headsets</string> + <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] --> <string name="enable_terminal_title">Local terminal</string> |