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

Merge "Update strings when shortString is true" into oc-mr1-dev am: d0066e3875

Browse Source 
am: 02e4c7d809

Change-Id: I031e65952befe7507ce09701af02e1131fe278cf
This commit is contained in:
jackqdyulei
2017-08-23 20:15:19 +00:00
committed by android-build-merger
parent 335ba1bf41 02e4c7d809
commit 002a20c8f3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/fuelgauge/BatteryInfo.java
View File

@@ -243,8 +243,7 @@ public class BatteryInfo {
info.remainingTimeUs = chargeTime;
CharSequence timeString = Utils.formatElapsedTime(context,
BatteryUtils.convertUsToMs(chargeTime), false /* withSeconds */);
int resId = shortString ? R.string.power_charging_duration_short
: R.string.power_charging_duration;
int resId = R.string.power_charging_duration;
info.remainingLabel = TextUtils.expandTemplate(context.getText(
R.string.power_remaining_charging_duration_only), timeString);
info.chargeLabel = TextUtils.expandTemplate(context.getText(resId),