OSDN Git Service

Add lower case charging string.
authorjackqdyulei <jackqdyulei@google.com>
Mon, 3 Apr 2017 18:31:40 +0000 (11:31 -0700)
committerjackqdyulei <jackqdyulei@google.com>
Mon, 3 Apr 2017 18:31:40 +0000 (11:31 -0700)
The previous charging string is "75% - Charging", this cl add lower
case string to make it "75% - charging".

Bug: 36558216
Test: Build
Change-Id: I683843de0b6cbd45bea6a465c7b6d8ee0b7c4f93

packages/SettingsLib/res/values/strings.xml
packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java

index c6562dc..ab4e2cb 100644 (file)
     <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 -->
index 7457435..5b2541c 100644 (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;