Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add lower case charging string." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-06 22:30:45 +00:00
committed by Android (Google) Code Review
parent 7a7c0ace82 a704efa644
commit e263940142
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/res/values/strings.xml
View File

@@ -811,6 +811,8 @@
<string name="battery_info_status_unknown">Unknown</string>
<!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging from an unknown source. -->
<string name="battery_info_status_charging">Charging</string>
<!-- [CHAR_LIMIT=20] Battery use screen with lower case. Battery status shown in chart label when charging from an unknown source. -->
<string name="battery_info_status_charging_lower">charging</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="battery_info_status_discharging">Not charging</string>
<!-- Battery Info screen. Value for a status item. Used for diagnostic info screens, precise translation isn't needed -->

4
packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java
View File

@@ -171,9 +171,11 @@ public class BatteryInfo {
info.mChargeLabelString = resources.getString(resId, info.batteryPercentString,
timeString);
} else {
final String chargeStatusLabel = resources.getString(
R.string.battery_info_status_charging_lower);
info.remainingLabel = null;
info.mChargeLabelString = resources.getString(
R.string.power_charging, info.batteryPercentString, info.statusLabel);
R.string.power_charging, info.batteryPercentString, chargeStatusLabel);
}
}
return info;