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

Commit 86f145d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid showing "0 minute" in the charge time label" into udc-dev

parents f7f38b2d 7fdd0e9e

src/com/android/settings/fuelgauge/BatteryInfo.java

+4 −3
Original line number Diff line number Diff line
@@ -299,9 +299,10 @@ public class BatteryInfo { 
                    (double) PowerUtil.convertUsToMs(info.remainingTimeUs), false /* withSeconds */,

                    true /* collapseTimeUnit */);

            int resId = R.string.power_charging_duration;

            info.remainingLabel = context.getString(R.string.power_remaining_charging_duration_only,

                    timeString);

            info.chargeLabel = context.getString(resId, info.batteryPercentString, timeString);

            info.remainingLabel = chargeTimeMs <= 0 ? null : context.getString(

                    R.string.power_remaining_charging_duration_only, timeString);

            info.chargeLabel = chargeTimeMs <= 0 ? info.batteryPercentString

                    : context.getString(resId, info.batteryPercentString, timeString);

        } else if (dockDefenderMode == BatteryUtils.DockDefenderMode.FUTURE_BYPASS) {

            // Dock defender will be triggered in the future, charging will be optimized.

            info.chargeLabel = context.getString(R.string.power_charging_future_paused,