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

Commit 4429f9a6 authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "Add strings for battery level info of connected devices" into oc-dr1-dev 

am: e269956a

Change-Id: Iad81be953573a43e7ff5cffb06af5222f4e67322
parents e26118d8 e269956a

packages/SettingsLib/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -130,6 +130,15 @@ 
    <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->

    <string name="bluetooth_connected_no_headset_no_a2dp">Connected (no phone or media)</string>



    <!-- Bluetooth settings.  Message when connected to a device, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_connected_battery_level">Connected, battery <xliff:g id="battery_level_as_percentage">%1$s</xliff:g></string>

    <!-- Bluetooth settings.  Message when connected to a device, except for phone audio, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_connected_no_headset_battery_level">Connected (no phone), battery <xliff:g id="battery_level_as_percentage">%1$s</xliff:g></string>

    <!-- Bluetooth settings.  Message when connected to a device, except for media audio, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_connected_no_a2dp_battery_level">Connected (no media), battery <xliff:g id="battery_level_as_percentage">%1$s</xliff:g></string>

    <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <string name="bluetooth_connected_no_headset_no_a2dp_battery_level">Connected (no phone or media), battery <xliff:g id="battery_level_as_percentage">%1$s</xliff:g></string>



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

    <string name="bluetooth_profile_a2dp">Media audio</string>

    <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -741,6 +741,8 @@ 
    <string name="quick_settings_done">Done</string>

    <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_connected">Connected</string>

    <!-- QuickSettings: Control panel: Label for connected device, showing remote device battery level. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_connected_battery_level">Connected, battery <xliff:g id="battery_level_as_percentage">%1$s</xliff:g></string>

    <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_connecting">Connecting...</string>

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