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

Merge "Add screen usage string for battery settings" into oc-dev

Browse Source 
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f
This commit is contained in:
jackqdyulei
2017-05-18 19:25:57 +00:00
committed by android-build-merger
parent 145c364479 28cf04d994
commit 3ab2ca5cc9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -4686,6 +4686,8 @@
<!-- Description for battery usage time for an app, i.e. Used for 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
<string name="battery_used_for">Used for <xliff:g id="time">^1</xliff:g></string>
<!-- Description for battery screen usage time for an app, i.e. Screen usage 30min. Note: ^1 should be used in all translations [CHAR LIMIT=60] -->
<string name="battery_screen_usage">Screen usage <xliff:g id="time">^1</xliff:g></string>
<!-- Description for battery usage info for an app, i.e. 60% used by facebook. [CHAR LIMIT=60] -->
<string name="battery_used_by"><xliff:g id="percent">%1$s</xliff:g> used by <xliff:g id="app">%2$s</xliff:g></string>
<!-- Description for percentage of battery usage for an app, i.e. Screen: 30% of overall battery. [CHAR LIMIT=60] -->

2
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -652,7 +652,7 @@ public class PowerUsageSummary extends PowerUsageBase {
final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), usageTimeMs,
false);
preference.setSummary(
TextUtils.expandTemplate(getText(R.string.battery_used_for), timeSequence));
TextUtils.expandTemplate(getText(R.string.battery_screen_usage), timeSequence));
}
}

6
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -362,10 +362,10 @@ public class PowerUsageSummaryTest {
@Test
public void testSetUsageSummary_timeMoreThanOneMinute_setSummary() {
final long usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
doReturn(mRealContext.getText(R.string.battery_used_for)).when(mFragment).getText(
R.string.battery_used_for);
doReturn(mRealContext.getText(R.string.battery_screen_usage)).when(mFragment).getText(
R.string.battery_screen_usage);
doReturn(mRealContext).when(mFragment).getContext();
final String expectedSummary = "Used for 2m";
final String expectedSummary = "Screen usage 2m";
mFragment.setUsageSummary(mPreference, usageTimeMs);