From ed1a79a97ea0c4907ef3b238701b4eec2db94670 Mon Sep 17 00:00:00 2001
From: Alice Kuo <aliceypkuo@google.com>
Date: Thu, 2 Jun 2022 13:45:44 +0800
Subject: [PATCH] Unify the LE audio string and refine the layout to put LE
 audio switch together

Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
Merged-In: I2d650eb315790c3efc7510d9e125aeaf4464cda6
(cherry picked from commit b13abc03dde1ea862cbb4565b679fabcaaf1c3a2)
---
 res/values/strings.xml           | 10 +++++-----
 res/xml/development_settings.xml |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e6b554fd809..f2eff886aaf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -342,8 +342,8 @@
 
     <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
     <string name="bluetooth_disable_a2dp_hw_offload">Disable Bluetooth A2DP hardware offload</string>
-    <!-- UI debug setting: Disable Bluetooth LE AUDIO hardware offload [CHAR LIMIT=none] -->
-    <string name="bluetooth_disable_le_audio_hw_offload">Disable Bluetooth LE AUDIO hardware offload</string>
+    <!-- UI debug setting: Disable Bluetooth LE audio hardware offload [CHAR LIMIT=none] -->
+    <string name="bluetooth_disable_le_audio_hw_offload">Disable Bluetooth LE audio hardware offload</string>
     <!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
     <string name="bluetooth_disable_hw_offload_dialog_title">Restart Device?</string>
     <!-- UI debug setting: Disable Bluetooth hardware offload [CHAR LIMIT=none] -->
@@ -354,9 +354,9 @@
     <string name="bluetooth_disable_hw_offload_dialog_cancel">Cancel</string>
 
     <!-- Setting Checkbox title for enabling Bluetooth LE Audio feature. [CHAR LIMIT=40] -->
-    <string name="bluetooth_enable_leaudio">Enable LE Audio</string>
-    <!-- Summary of checkbox for enabling Bluetooth le audio [CHAR LIMIT=none]-->
-    <string name="bluetooth_enable_leaudio_summary">Enables the Bluetooth LE Audio feature if this device supports LE audio hardware capabilities.</string>
+    <string name="bluetooth_enable_leaudio">Enable Bluetooth LE audio</string>
+    <!-- Summary of checkbox for enabling Bluetooth LE audio [CHAR LIMIT=none]-->
+    <string name="bluetooth_enable_leaudio_summary">Enables Bluetooth LE audio feature if the device supports LE audio hardware capabilities.</string>
 
     <!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
     <string name="connected_device_media_device_title">Media devices</string>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 9367aec5a18..19c12091400 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -324,14 +324,14 @@
             android:title="@string/bluetooth_enable_leaudio"
             android:summary="@string/bluetooth_enable_leaudio_summary" />
 
-        <SwitchPreference
-            android:key="bluetooth_disable_a2dp_hw_offload"
-            android:title="@string/bluetooth_disable_a2dp_hw_offload" />
-
         <SwitchPreference
             android:key="bluetooth_disable_le_audio_hw_offload"
             android:title="@string/bluetooth_disable_le_audio_hw_offload" />
 
+        <SwitchPreference
+            android:key="bluetooth_disable_a2dp_hw_offload"
+            android:title="@string/bluetooth_disable_a2dp_hw_offload" />
+
         <ListPreference
             android:key="bluetooth_select_avrcp_version"
             android:title="@string/bluetooth_select_avrcp_version_string"