Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd98c5dd authored by jackqdyulei's avatar jackqdyulei Committed by android-build-merger
Browse files

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

am: e2639401

Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4
parents 3e910212 e2639401

packages/SettingsLib/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -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 -->

packages/SettingsLib/src/com/android/settingslib/BatteryInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -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;