From dd9e99d26c1fc4b6566a8aee493b00e94f5d3f73 Mon Sep 17 00:00:00 2001
From: Jack He <siyuanh@google.com>
Date: Thu, 7 Dec 2017 15:18:40 -0800
Subject: [PATCH] Bluetooth: Remove strings for enabling inband ringing

* As in-band ringing is enabled by default on supported devices, user
  action in development settings should be disabling it instead of
  enabling it
* The new string is added to packages/apps/Settings and the old string
  is hence removed from SettingsLib

Bug: 65383086
Test: make, try toggling the preference and verify in-band ringing's
      behavior
Change-Id: I18858e86f4127f6555cce27d239d2682b6134fe2
Merged-In: I18858e86f4127f6555cce27d239d2682b6134fe2
(cherry picked from commit 326f1db42cabe8a7f2bcaef441a3353af98bba5f)
---
 packages/SettingsLib/res/values/strings.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 8a4a77473871b..6601451420841 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -488,8 +488,6 @@
     <string name="bluetooth_show_devices_without_names">Show Bluetooth devices without names</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>
@@ -582,8 +580,6 @@
     <string name="bluetooth_show_devices_without_names_summary">Bluetooth devices without names (MAC addresses only) will be displayed</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>