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

Commit aee2d55b authored by Zaiyue Xue's avatar Zaiyue Xue Committed by Android (Google) Code Review
Browse files

Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev

parents 9cb05bc5 866203a3

res/values/strings.xml

+16 −16
Original line number Diff line number Diff line
@@ -6372,8 +6372,8 @@ 
    <string name="advanced_battery_preference_title">Battery usage</string>

    <!-- Preference summary for advanced battery usage, for past 24 hours [CHAR LIMIT=40] -->

    <string name="advanced_battery_preference_summary_with_hours">View usage for past 24 hours</string>

    <!-- Preference summary for advanced battery usage, from last full charge [CHAR LIMIT=40] -->

    <string name="advanced_battery_preference_summary">View usage from last full charge</string>

    <!-- Preference summary for advanced battery usage, since last full charge [CHAR LIMIT=40] -->

    <string name="advanced_battery_preference_summary">View usage since last full charge</string>















    <!-- Activity title for battery usage details for an app. or power consumer -->















    <string name="battery_details_title">App battery usage</string>










@@ -6748,50 +6748,50 @@













    <!-- Title for the battery management group [CHAR LIMIT=40] -->















    <string name ="battery_detail_manage_title">Manage battery usage</string>



























    <!-- Description for battery total and background usage time for an app, i.e. 1 hr 15 min total • 39 min background from last full charge. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_total_and_bg_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • <xliff:g id="time" example="39 min">^2</xliff:g> background\nfrom last full charge</string>













    <!-- Description for battery total and background usage time for an app, i.e. 1 hr 15 min total • 39 min background since last full charge. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_total_and_bg_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • <xliff:g id="time" example="39 min">^2</xliff:g> background\nsince last full charge</string>















    <!-- Description for battery total and background usage time for an app, i.e. 1 hr 15 min total • 39 min background for past 24 hr. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_and_bg_usage_24hr"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • <xliff:g id="time" example="39 min">^2</xliff:g> background\nfor past 24 hr</string>















    <!-- Description for battery total and background usage time in a time period for an app, i.e. 1 hr 15 min total • 39 min background for 12 am-2 am. Note: ^1, ^2 and ^3 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_and_bg_usage_with_period"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • <xliff:g id="time" example="39 min">^2</xliff:g> background\nfor <xliff:g id="time_period" example="12 am-2 am">^3</xliff:g></string>



























    <!-- Description for battery total usage time is less than a minute for an app from last full charge [CHAR LIMIT=120] -->













    <string name="battery_total_usage_less_minute">Total less than a minute from last full charge</string>













    <!-- Description for battery total usage time is less than a minute for an app since last full charge [CHAR LIMIT=120] -->













    <string name="battery_total_usage_less_minute">Total less than a minute since last full charge</string>















    <!-- Description for battery total usage time is less than a minute for an app for past 24 hr [CHAR LIMIT=120] -->















    <string name="battery_total_usage_less_minute_24hr">Total less than a minute for past 24 hr</string>















    <!-- Description for battery total usage time is less than a minute in a time period for an app, i.e. Total less than a minute for 12 am-2 am. Note: ^1 should be used in all translations[CHAR LIMIT=120] -->















    <string name="battery_total_usage_less_minute_with_period">Total less than a minute for <xliff:g id="time_period" example="12 am-2 am">^1</xliff:g></string>



























    <!-- Description for battery background usage time is less than a minute for an app from last full charge [CHAR LIMIT=120] -->













    <string name="battery_bg_usage_less_minute">Background less than a minute from last full charge</string>













    <!-- Description for battery background usage time is less than a minute for an app since last full charge [CHAR LIMIT=120] -->













    <string name="battery_bg_usage_less_minute">Background less than a minute since last full charge</string>















    <!-- Description for battery background usage time is less than a minute for an app for past 24 hr [CHAR LIMIT=120] -->















    <string name="battery_bg_usage_less_minute_24hr">Background less than a minute for past 24 hr</string>















    <!-- Description for battery background usage time is less than a minute in a time period for an app, i.e. Background less than a minute for 12 am-2 am. Note: ^1 should be used in all translations[CHAR LIMIT=120] -->















    <string name="battery_bg_usage_less_minute_with_period">Background less than a minute for <xliff:g id="time_period" example="12 am-2 am">^1</xliff:g></string>



























    <!-- Description for battery total usage time for an app, i.e. 1 hr 15 min total from last full charge. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_total_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total from last full charge</string>













    <!-- Description for battery total usage time for an app, i.e. 1 hr 15 min total since last full charge. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_total_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total since last full charge</string>















    <!-- Description for battery total usage time for an app, i.e. 1 hr 15 min total for past 24 hr. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_usage_24hr"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total for past 24 hr</string>















    <!-- Description for battery total usage time in a time period for an app, i.e. 1 hr 15 min total for 12 am-2 am. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_usage_with_period"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total for <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>



























    <!-- Description for battery background usage time for an app, i.e. 1 hr 15 min background from last full charge. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_bg_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> background from last full charge</string>













    <!-- Description for battery background usage time for an app, i.e. 1 hr 15 min background since last full charge. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_bg_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> background since last full charge</string>















    <!-- Description for battery background usage time for an app, i.e. 1 hr 15 min background for past 24 hr. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_bg_usage_24hr"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> background for past 24 hr</string>















    <!-- Description for battery background usage time in a time period for an app, i.e. 1 hr 15 min background for 12 am-2 am. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_bg_usage_with_period"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> background for <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>



























    <!-- Description for battery total usage with background usage time less than a minute for an app, i.e. 1 hr 15 min total • background less than a minute from last full charge. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_total_usage_and_bg_less_minute_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • background less than a minute\nfrom last full charge</string>













    <!-- Description for battery total usage with background usage time less than a minute for an app, i.e. 1 hr 15 min total • background less than a minute since last full charge. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->













    <string name="battery_total_usage_and_bg_less_minute_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • background less than a minute\nsince last full charge</string>















    <!-- Description for battery total usage with background usage time less than a minute for an app, i.e. 1 hr 15 min total • background less than a minute for past 24 hr. Note: ^1 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_usage_and_bg_less_minute_usage_24hr"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • background less than a minute\nfor past 24 hr</string>















    <!-- Description for battery total usage with background usage time less than a minute in a time period for an app, i.e. 1 hr 15 min total • background less than a minute for 12 am-2 am. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_usage_and_bg_less_minute_usage_with_period"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • background less than a minute\nfor <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>



























    <!-- Description for no any battery usage from last full charge [CHAR LIMIT=120] -->













    <string name="battery_not_usage">No usage from last full charge</string>













    <!-- Description for no any battery usage since last full charge [CHAR LIMIT=120] -->













    <string name="battery_not_usage">No usage since last full charge</string>















    <!-- Description for no any battery usage for past 24 hr [CHAR LIMIT=120] -->















    <string name="battery_not_usage_24hr">No usage for past 24 hr</string>















    <!-- Description for no usage time but have battery usage [CHAR LIMIT=120] -->

























tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -467,7 +467,7 @@ public class AdvancedPowerUsageDetailTest {













        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);















        verify(mEntityHeaderController).setSummary(captor.capture());















        assertThat(captor.getValue().toString())













                .isEqualTo("2 min background from last full charge");













                .isEqualTo("2 min background since last full charge");















    }































    @Test









@@ -485,7 +485,7 @@ public class AdvancedPowerUsageDetailTest {













        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);















        verify(mEntityHeaderController).setSummary(captor.capture());















        assertThat(captor.getValue().toString())













                .isEqualTo("Background less than a minute from last full charge");













                .isEqualTo("Background less than a minute since last full charge");















    }































    @Test









@@ -504,7 +504,7 @@ public class AdvancedPowerUsageDetailTest {













        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);















        verify(mEntityHeaderController).setSummary(captor.capture());















        assertThat(captor.getValue().toString())













                .isEqualTo("Total less than a minute from last full charge");













                .isEqualTo("Total less than a minute since last full charge");















    }































    @Test









@@ -520,8 +520,8 @@ public class AdvancedPowerUsageDetailTest {





























        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);















        verify(mEntityHeaderController).setSummary(captor.capture());













        assertThat(captor.getValue().toString())













                .isEqualTo("1 min total • background less than a minute\nfrom last full charge");













        assertThat(captor.getValue().toString()).isEqualTo(













                "1 min total • background less than a minute\nsince last full charge");















    }































    @Test









@@ -538,7 +538,7 @@ public class AdvancedPowerUsageDetailTest {













        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);















        verify(mEntityHeaderController).setSummary(captor.capture());















        assertThat(captor.getValue().toString())













                .isEqualTo("1 min total from last full charge");













                .isEqualTo("1 min total since last full charge");















    }































    @Test









@@ -555,7 +555,7 @@ public class AdvancedPowerUsageDetailTest {













        ArgumentCaptor<CharSequence> captor = ArgumentCaptor.forClass(CharSequence.class);















        verify(mEntityHeaderController).setSummary(captor.capture());















        assertThat(captor.getValue().toString())













                .isEqualTo("6 min total • 4 min background\nfrom last full charge");













                .isEqualTo("6 min total • 4 min background\nsince last full charge");















    }































    @Test

































tests/robotests/src/com/android/settings/fuelgauge/batteryusage/PowerUsageSummaryTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -142,7 +142,7 @@ public class PowerUsageSummaryTest {













    public void initPreference_hasCorrectSummary() {















        mFragment.initPreference();





























        verify(mBatteryUsagePreference).setSummary("View usage from last full charge");













        verify(mBatteryUsagePreference).setSummary("View usage since last full charge");















    }































    @Test