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

Commit 97287b10 authored by Wesley Wang's avatar Wesley Wang Committed by Automerger Merge Worker
Browse files

Merge "Add description to battery settings footer link (1/3)" into sc-dev am:... 

Merge "Add description to battery settings footer link (1/3)" into sc-dev am: e48bc570 am: 8d9b7157

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

Change-Id: I7d0ae6b4f9b3bc7f2408e6318d317fed136c3e43
parents 40844c6b 8d9b7157

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -5020,7 +5020,7 @@ 
    <string name="confirm_battery_saver">OK</string>



    <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description, with a "learn more" link. -->

    <string name="battery_saver_description_with_learn_more">Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features, and some network connections.\n\n<annotation id="url">Learn more</annotation></string>

    <string name="battery_saver_description_with_learn_more">Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features, and some network connections.</string>



    <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description, without a "learn more" link. -->

    <string name="battery_saver_description">Battery Saver turns on Dark theme and limits or turns off background activity, some visual effects, certain features, and some network connections.</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->

    <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 it's charging 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 temporarily limited</string>



    <!-- When the lock screen is showing and the battery is low, warn user to plug