Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix strings. "shutdown" should be "shut down"."

Browse Source
This commit is contained in:
Stanley Wang
2020-02-11 02:22:30 +00:00
committed by Android (Google) Code Review
parent d65e48bfc4 8998d03992
commit 714475efc2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SettingsLib/res/values/strings.xml
View File

@@ -1069,17 +1069,17 @@
<string name="power_remaining_only_more_than_subtext">More than <xliff:g id="time_remaining">%1$s</xliff:g> remaining</string>
<!-- [CHAR_LIMIT=50] Short label for imminent shutdown warning of device -->
<string name="power_remaining_duration_only_shutdown_imminent" product="default">Phone may shutdown soon</string>
<string name="power_remaining_duration_only_shutdown_imminent" product="default">Phone may shut down soon</string>
<!-- [CHAR_LIMIT=50] Short label for imminent shutdown warning of device -->
<string name="power_remaining_duration_only_shutdown_imminent" product="tablet">Tablet may shutdown soon</string>
<string name="power_remaining_duration_only_shutdown_imminent" product="tablet">Tablet may shut down soon</string>
<!-- [CHAR_LIMIT=50] Short label for imminent shutdown warning of device -->
<string name="power_remaining_duration_only_shutdown_imminent" product="device">Device may shutdown soon</string>
<string name="power_remaining_duration_only_shutdown_imminent" product="device">Device may shut down soon</string>
<!-- [CHAR_LIMIT=60] Label for battery level chart when shutdown is imminent-->
<string name="power_remaining_duration_shutdown_imminent" product="default">Phone may shutdown soon (<xliff:g id="level">%1$s</xliff:g>)</string>
<string name="power_remaining_duration_shutdown_imminent" product="default">Phone may shut down soon (<xliff:g id="level">%1$s</xliff:g>)</string>
<!-- [CHAR_LIMIT=60] Label for battery level chart when shutdown is imminent-->
<string name="power_remaining_duration_shutdown_imminent" product="tablet">Tablet may shutdown soon (<xliff:g id="level">%1$s</xliff:g>)</string>
<string name="power_remaining_duration_shutdown_imminent" product="tablet">Tablet may shut down soon (<xliff:g id="level">%1$s</xliff:g>)</string>
<!-- [CHAR_LIMIT=60] Label for battery level chart when shutdown is imminent-->
<string name="power_remaining_duration_shutdown_imminent" product="device">Device may shutdown soon (<xliff:g id="level">%1$s</xliff:g>)</string>
<string name="power_remaining_duration_shutdown_imminent" product="device">Device may shut down soon (<xliff:g id="level">%1$s</xliff:g>)</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
<string name="power_charging"><xliff:g id="level">%1$s</xliff:g> - <xliff:g id="state">%2$s</xliff:g></string>

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

@@ -120,9 +120,9 @@ public class PowerUtilTest {
true /* basedOnUsage */);
// additional battery percentage in this string
assertThat(info).isEqualTo("Phone may shutdown soon (10%)");
assertThat(info).isEqualTo("Phone may shut down soon (10%)");
// shortened string should not have percentage
assertThat(info2).isEqualTo("Phone may shutdown soon");
assertThat(info2).isEqualTo("Phone may shut down soon");
}
@Test