Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fd4ecb4 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update the wording for LE Audio"" into udc-qpr-dev am: 73c811b2 am: 4b970a47 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844564



Change-Id: I67a908138990fe72d62082de21d7e6807cdbb503
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67fb4d91 4b970a47

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -1532,8 +1532,6 @@ 
    <string name="bluetooth_companion_app_remove_association_dialog_title">Disconnect App?</string>

    <!-- Bluetooth device details companion apps. The body of confirmation dialog for remove association. [CHAR LIMIT=60] -->

    <string name="bluetooth_companion_app_body"><xliff:g id="app_name" example="App Name">%1$s</xliff:g> app will no longer connect to your <xliff:g id="device_name" example="Device Name">%2$s</xliff:g></string>

    <!-- Summary of Bluetooth LE Audio toggle in Device Details. [CHAR LIMIT=40] -->

    <string name="device_details_leaudio_toggle_summary">Experimental. Improves audio quality.</string>









    <!--  Bluetooth device details. In the confirmation dialog for unpairing a paired device, this is the label on the button that will complete the unpairing action. -->









    <string name="bluetooth_unpair_dialog_forget_confirm_button">Forget device</string>
































src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java



+0
−4






























Original line number
Diff line number
Diff line







@@ -116,10 +116,6 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll







        pref.setTitle(profile.getNameResource(mCachedDevice.getDevice()));









        pref.setOnPreferenceClickListener(this);









        pref.setOrder(profile.getOrdinal());



















        if (profile instanceof LeAudioProfile) {









            pref.setSummary(R.string.device_details_leaudio_toggle_summary);









        }









        return pref;









    }