PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update string for battery seekbar" into pi-dev am: 8916df573d

Browse Source 
am: b5d38cc5f9

Change-Id: I4d631531c96e1afca80edca0779a02a5aa3e20fe
This commit is contained in:
Lei Yu
2018-03-20 08:32:40 +00:00
committed by android-build-merger
parent e89345ac20 b5d38cc5f9
commit f687bc9b99
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -5194,7 +5194,7 @@
<string name="battery_saver_auto_title">Turn on automatically</string> <string name="battery_saver_auto_title">Turn on automatically</string>
<!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] --> <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->
<string name="battery_saver_seekbar_title">Turn on automatically at <xliff:g id="percent">%1$s</xliff:g></string> <string name="battery_saver_seekbar_title">Turn on at <xliff:g id="percent">%1$s</xliff:g></string>
<!-- Used in the Battery Saver settings screen to control turning on/off the feature entirely --> <!-- Used in the Battery Saver settings screen to control turning on/off the feature entirely -->
<string name="battery_saver_master_switch_title">Use Battery Saver</string> <string name="battery_saver_master_switch_title">Use Battery Saver</string>

2
tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
View File

@@ -85,7 +85,7 @@ public class AutoBatterySeekBarPreferenceControllerTest {
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.isVisible()).isTrue(); assertThat(mPreference.isVisible()).isTrue();
assertThat(mPreference.getTitle()).isEqualTo("Turn on automatically at 20%"); assertThat(mPreference.getTitle()).isEqualTo("Turn on at 20%");
assertThat(mPreference.getProgress()).isEqualTo(TRIGGER_LEVEL); assertThat(mPreference.getProgress()).isEqualTo(TRIGGER_LEVEL);
} }