diff options
| author | 2018-03-19 16:27:41 +0000 | |
|---|---|---|
| committer | 2018-03-19 16:27:41 +0000 | |
| commit | a822d424153463afaa51037f121c77c25a6fa6af (patch) | |
| tree | f0759bdebc448ef28a10d4fe16a7dfc6cdb5acb1 | |
| parent | 781533dc32f3003afa6c6ad68139a00fb200c7e5 (diff) | |
| parent | ba499efa7a139daf6d9c1b20b326fa762a081818 (diff) | |
Merge "Softens one of the battery strings per UI request" into pi-dev
| -rw-r--r-- | packages/SettingsLib/res/values/strings.xml | 8 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index e77db82a520c..fe785c2e5c91 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -887,13 +887,13 @@ <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 --> - <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 --> - <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 --> - <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 --> - <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 --> <string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string> diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java index 5758467766a8..c11687b35856 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/PowerUtilTest.java @@ -40,7 +40,7 @@ public class PowerUtilTest { 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 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"; // matches a time (ex: '1:15 PM', '2 AM') public static final String TIME_OF_DAY_REGEX = " (\\d)+:?(\\d)* (AM)|(PM)"; |