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

Commit 888d0b43 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update charging limited string" into tm-qpr-dev am: 4bd41537 

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



Change-Id: I5e8d4a27c6fc1984a3ffa23870780c5732b3313b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91f41ce6 4bd41537

packages/SettingsLib/res/values/strings.xml

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

    <!-- [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>

    <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 -->

    <!-- [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 is paused</string>

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

    <!-- [CHAR_LIMIT=80] Label for battery charging future pause -->

    <!-- [CHAR_LIMIT=80] Label for battery charging future pause -->

    <string name="power_charging_future_paused"><xliff:g id="level">%1$s</xliff:g> - Charging to <xliff:g id="dock_defender_threshold">%2$s</xliff:g></string>

    <string name="power_charging_future_paused"><xliff:g id="level">%1$s</xliff:g> - Charging to <xliff:g id="dock_defender_threshold">%2$s</xliff:g></string>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ 
    <string name="keyguard_plugged_in_charging_slowly"><xliff:g id="percentage">%s</xliff:g> • Charging slowly</string>

    <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.  -->

    <!-- 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 is paused to protect battery</string>

    <string name="keyguard_plugged_in_charging_limited"><xliff:g id="percentage">%s</xliff:g> • Charging 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. -->

    <!-- 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>

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