From a704efa644a5fa0f8e0267dea0a13404347f0430 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Mon, 3 Apr 2017 11:31:40 -0700 Subject: [PATCH] Add lower case charging string. 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 | 2 ++ .../SettingsLib/src/com/android/settingslib/BatteryInfo.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 5f2001b35ab2e..ff310cc233a7c 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -811,6 +811,8 @@ Unknown Charging + + charging Not charging diff --git a/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java b/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java index 7457435be5d6f..5b2541c8e7d10 100644 --- a/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java +++ b/packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java @@ -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;