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

Commit a822d424 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Softens one of the battery strings per UI request" into pi-dev

parents 781533dc ba499efa

packages/SettingsLib/res/values/strings.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -887,13 +887,13 @@ 
    <string name="power_remaining_duration_only_short"><xliff:g id="time">%1$s</xliff:g> left</string>

    <string name="power_remaining_duration_only_short"><xliff:g id="time">%1$s</xliff:g> left</string>





    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery -->

    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery -->

    <string name="power_discharge_by_enhanced">Will last until about <xliff:g id="time">%1$s</xliff:g> based on your usage (<xliff:g id="level">%2$s</xliff:g>)</string>

    <string name="power_discharge_by_enhanced">Should last until about <xliff:g id="time">%1$s</xliff:g> based on your usage (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery with no percentage -->

    <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery with no percentage -->

    <string name="power_discharge_by_only_enhanced">Will last until about <xliff:g id="time">%1$s</xliff:g> based on your usage</string>

    <string name="power_discharge_by_only_enhanced">Should last until about <xliff:g id="time">%1$s</xliff:g> based on your usage</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <string name="power_discharge_by">Will last until about <xliff:g id="time">%1$s</xliff:g> (<xliff:g id="level">%2$s</xliff:g>)</string>

    <string name="power_discharge_by">Should last until about <xliff:g id="time">%1$s</xliff:g> (<xliff:g id="level">%2$s</xliff:g>)</string>

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->

    <string name="power_discharge_by_only">Will last until about <xliff:g id="time">%1$s</xliff:g></string>

    <string name="power_discharge_by_only">Should last until about <xliff:g id="time">%1$s</xliff:g></string>





    <!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount -->

    <!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount -->

    <string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string>

    <string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string>

packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ public class PowerUtilTest { 
    public static final long TEN_MINUTES_MILLIS = Duration.ofMinutes(10).toMillis();

    public static final long TEN_MINUTES_MILLIS = Duration.ofMinutes(10).toMillis();

    public static final long THREE_DAYS_MILLIS = Duration.ofDays(3).toMillis();

    public static final long THREE_DAYS_MILLIS = Duration.ofDays(3).toMillis();

    public static final long THIRTY_HOURS_MILLIS = Duration.ofHours(30).toMillis();

    public static final long THIRTY_HOURS_MILLIS = Duration.ofHours(30).toMillis();

    public static final String NORMAL_CASE_EXPECTED_PREFIX = "Will last until about";

    public static final String NORMAL_CASE_EXPECTED_PREFIX = "Should last until about";

    public static final String ENHANCED_SUFFIX = " based on your usage";

    public static final String ENHANCED_SUFFIX = " based on your usage";

    // matches a time (ex: '1:15 PM', '2 AM')

    // matches a time (ex: '1:15 PM', '2 AM')

    public static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* (AM)|(PM)";

    public static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* (AM)|(PM)";