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

Commit b11c9737 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #15597136: n7 not showing estimated discharge time 

Use battery plugged state to decide whether to show the estimated
discharge time remaining vs. charge time remaining.

Change-Id: I2e0d12871201e7d4927aaa9a94d15bff949a881c
parent f9360dbc

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

+3 −3
Original line number Diff line number Diff line
@@ -489,11 +489,9 @@ public class BatteryHistoryChart extends View { 
                R.string.percentage, 0);



        int batteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);

        final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,

                BatteryManager.BATTERY_STATUS_UNKNOWN);

        long remainingTimeUs = 0;

        mDischarging = true;

        if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {

        if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {

            final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs);

            if (drainTime > 0) {

                remainingTimeUs = drainTime;
@@ -509,6 +507,8 @@ public class BatteryHistoryChart extends View { 
            final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);

            final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(),

                    mBatteryBroadcast);

            final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,

                    BatteryManager.BATTERY_STATUS_UNKNOWN);

            if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {

                mDischarging = false;

                remainingTimeUs = chargeTime;