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

Commit c0fe8f22 authored by Wesley.CW Wang's avatar Wesley.CW Wang Committed by Wesley Wang
Browse files

Update battery state string 

 - Update battery saver state string
 - Update app usage active time string

Bug: 187779948
Bug: 187778616
Test: make SettingsRoboTests
Change-Id: Ifc4e5528f0f2d17c0461a83f250fb9c4acba042d
parent 7a8d2f44

res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -5998,7 +5998,7 @@ 
    <!-- Summary for the early hedas up tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_summary">Battery may run out earlier than usual</string>

    <!-- Title when early heads up is solved [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_done_title">Battery Saver is on</string>

    <string name="battery_tip_early_heads_up_done_title">Battery Saver on</string>

    <!-- Summary when early heads up is solved [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_done_summary">Some features may be limited</string>

    <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->
@@ -6324,9 +6324,9 @@ 
    <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 for past 24 hr. 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 for past 24 hr</string>









    <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\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 for <xliff:g id="time_period" example="12 am-2 am">^3</xliff:g></string>









    <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 [CHAR LIMIT=120] -->









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








@@ -6349,9 +6349,9 @@







    <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 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"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • background less than a minute for past 24 hr</string>









    <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\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 for <xliff:g id="time_period" example="12 am-2 am">^2</xliff:g></string>









    <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 for past 24 hr [CHAR LIMIT=120] -->









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

























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



+1
−1






























Original line number
Diff line number
Diff line







@@ -184,7 +184,7 @@ public class BatteryHeaderPreferenceControllerTest {

















        mController.updateHeaderPreference(mBatteryInfo);



















        final String expectedResult = "Battery Saver is on • " + TIME_LEFT;









        final String expectedResult = "Battery Saver on • " + TIME_LEFT;









        verify(mBatteryUsageProgressBarPref).setBottomSummary(expectedResult);









    }