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

Commit 5a790e1d authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Update "Hearing Aids" into "Hearing aids"" into udc-qpr-dev am: 5d34b6e0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23484366



Change-Id: I1546203fce2819d374fd39f37777e18763861942
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 419ca3ba 5d34b6e0

packages/SettingsLib/res/values/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -241,12 +241,12 @@ 
    <!-- Bluetooth settings. Similar to bluetooth_profile_a2dp_high_quality, but used when the device supports high quality audio but we don't know which codec that will be used. -->

    <string name="bluetooth_profile_a2dp_high_quality_unknown_codec">HD audio</string>



    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the Hearing Aid profile. -->

    <string name="bluetooth_profile_hearing_aid">Hearing Aids</string>

    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the Hearing aid profile. -->

    <string name="bluetooth_profile_hearing_aid">Hearing aids</string>

    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the LE audio profile. -->

    <string name="bluetooth_profile_le_audio">LE Audio</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the Hearing Aid checkbox preference when Hearing Aid is connected. -->

    <string name="bluetooth_hearing_aid_profile_summary_connected">Connected to Hearing Aids</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the Hearing aid checkbox preference when hearing aid is connected. -->

    <string name="bluetooth_hearing_aid_profile_summary_connected">Connected to hearing aids</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the LE audio checkbox preference when LE audio is connected. -->

    <string name="bluetooth_le_audio_profile_summary_connected">Connected to LE audio</string>
@@ -287,8 +287,8 @@ 
         for the HID checkbox preference that describes how checking it

         will set the HID profile as preferred. -->

    <string name="bluetooth_hid_profile_summary_use_for">Use for input</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the Hearing Aid checkbox preference that describes how checking it will set the Hearing Aid profile as preferred. -->

    <string name="bluetooth_hearing_aid_profile_summary_use_for">Use for Hearing Aids</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the Hearing aid checkbox preference that describes how checking it will set the hearing aid related profile as preferred. -->

    <string name="bluetooth_hearing_aid_profile_summary_use_for">Use for hearing aids</string>

    <!-- Bluetooth settings.  Connection options screen.  The summary for the LE_AUDIO checkbox preference that describes how checking it will set the LE_AUDIO profile as preferred. -->

    <string name="bluetooth_le_audio_profile_summary_use_for">Use for LE_AUDIO</string>

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -613,8 +613,8 @@ 
    <string name="quick_settings_bluetooth_secondary_label_headset">Headset</string>

    <!-- QuickSettings: Bluetooth secondary label for an input/IO device being connected [CHAR LIMIT=20]-->

    <string name="quick_settings_bluetooth_secondary_label_input">Input</string>

    <!-- QuickSettings: Bluetooth secondary label for a Hearing Aids device being connected [CHAR LIMIT=20]-->

    <string name="quick_settings_bluetooth_secondary_label_hearing_aids">Hearing Aids</string>

    <!-- QuickSettings: Bluetooth secondary label for a Hearing aids device being connected [CHAR LIMIT=20]-->

    <string name="quick_settings_bluetooth_secondary_label_hearing_aids">Hearing aids</string>

    <!-- QuickSettings: Bluetooth secondary label shown when bluetooth is being enabled [CHAR LIMIT=NONE] -->

    <string name="quick_settings_bluetooth_secondary_label_transient">Turning on&#8230;</string>

    <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->