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

Commit 18c44452 authored by Wesley Wang's avatar Wesley Wang Committed by Android (Google) Code Review
Browse files

Merge "Update charging string" into tm-qpr-dev

parents 073eeabf 5a753625

packages/SettingsLib/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ 
    <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->

    <string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="time">%2$s</xliff:g> left until full</string>

    <!-- [CHAR_LIMIT=80] Label for battery level chart when charge been limited -->

    <string name="power_charging_limited"><xliff:g id="level">%1$s</xliff:g> - Charging temporarily limited</string>

    <string name="power_charging_limited"><xliff:g id="level">%1$s</xliff:g> - Charging is paused</string>



    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_unknown">Unknown</string>
@@ -1138,7 +1138,7 @@ 
    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging wirelessly.  -->

    <string name="battery_info_status_charging_wireless">Charging wirelessly</string>

    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when the device is dock charging.  -->

    <string name="battery_info_status_charging_dock">Charging Dock</string>

    <string name="battery_info_status_charging_dock">Charging</string>

    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->

    <string name="battery_info_status_discharging">Not charging</string>

    <!-- Battery Info screen. Value for a status item. A state which device is connected with any charger(e.g. USB, Adapter or Wireless) but not charging yet. Used for diagnostic info screens, precise translation isn't needed -->

packages/SystemUI/res-keyguard/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
    <!-- When the lock screen is showing and the phone plugged in, and the battery is not fully charged, say that it's wirelessly charging. [CHAR LIMIT=50]  -->

    <string name="keyguard_plugged_in_wireless"><xliff:g id="percentage" example="20%">%s</xliff:g> • Charging wirelessly</string>



    <!-- When the lock screen is showing and the phone plugged in, and the battery is not fully charged, say that it's dock charging. [CHAR LIMIT=50]  -->

    <string name="keyguard_plugged_in_dock"><xliff:g id="percentage" example="20%">%s</xliff:g> • Charging Dock</string>

    <!-- When the lock screen is showing and the phone plugged in, and the battery is not fully charged, say that it's charging. [CHAR LIMIT=50]  -->

    <string name="keyguard_plugged_in_dock"><xliff:g id="percentage" example="20%">%s</xliff:g> • Charging</string>



    <!-- When the lock screen is showing and the phone plugged in, and the battery

         is not fully charged, say that it's charging.  -->
@@ -53,7 +53,7 @@ 
    <string name="keyguard_plugged_in_charging_slowly"><xliff:g id="percentage">%s</xliff:g> • Charging slowly</string>



    <!-- When the lock screen is showing and the phone plugged in, and the defend mode is triggered, say that charging is temporarily limited.  -->

    <string name="keyguard_plugged_in_charging_limited"><xliff:g id="percentage">%s</xliff:g> • Charging temporarily limited</string>

    <string name="keyguard_plugged_in_charging_limited"><xliff:g id="percentage">%s</xliff:g> • Charging is paused to protect battery</string>



    <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->

    <string name="keyguard_instructions_when_pattern_disabled">Press Menu to unlock.</string>

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ 
    <string name="keyguard_indication_charging_time_slowly"><xliff:g id="percentage">%2$s</xliff:g> • Charging slowly • Full in <xliff:g id="charging_time_left" example="4 hr, 2 min">%1$s</xliff:g></string>



    <!-- Indication on the keyguard that is shown when the device is dock charging. [CHAR LIMIT=80]-->

    <string name="keyguard_indication_charging_time_dock"><xliff:g id="percentage" example="20%">%2$s</xliff:g> • Charging Dock • Full in <xliff:g id="charging_time_left" example="4 hr, 2 min">%1$s</xliff:g></string>

    <string name="keyguard_indication_charging_time_dock"><xliff:g id="percentage" example="20%">%2$s</xliff:g> • Charging • Full in <xliff:g id="charging_time_left" example="4 hr, 2 min">%1$s</xliff:g></string>



    <!-- Related to user switcher --><skip/>