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

Commit 86c99e28 authored by Bart Sears's avatar Bart Sears
Browse files

Revert "Update name of field used from BatterySipper" 

Companion CL needed to be reverted as it was breaking the build, so
reverting this CL as well until Adam has a chance to investigate.

This reverts commit a74ddc29.

Change-Id: I8e6f2f48d930db9db7eae1a07492da91b0c38f88
parent a74ddc29

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

+18 −17
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.android.settings.Utils.prepareCustomPreferencesList; 
import android.app.Activity;

import android.app.ActivityManager;

import android.app.ApplicationErrorReport;

import android.app.Fragment;

import android.app.admin.DevicePolicyManager;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -92,9 +93,9 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC 
        Bundle args = new Bundle();

        args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name);

        args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int)

                ((entry.sipper.totalPowerMah * dischargeAmount / helper.getTotalPower()) + .5));

                ((entry.sipper.value * dischargeAmount / helper.getTotalPower()) + .5));

        args.putInt(PowerUsageDetail.EXTRA_GAUGE, (int)

                Math.ceil(entry.sipper.totalPowerMah * 100 / helper.getMaxPower()));

                Math.ceil(entry.sipper.value * 100 / helper.getMaxPower()));

        args.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, helper.getStatsPeriod());

        args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName);

        args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId);
@@ -128,11 +129,11 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC 
                    R.string.usage_type_video,

                };

                values = new double[] {

                    entry.sipper.cpuTimeMs,

                    entry.sipper.cpuFgTimeMs,

                    entry.sipper.wakeLockTimeMs,

                    entry.sipper.gpsTimeMs,

                    entry.sipper.wifiRunningTimeMs,

                    entry.sipper.cpuTime,

                    entry.sipper.cpuFgTime,

                    entry.sipper.wakeLockTime,

                    entry.sipper.gpsTime,

                    entry.sipper.wifiRunningTime,

                    entry.sipper.mobileRxPackets,

                    entry.sipper.mobileTxPackets,

                    entry.sipper.mobileActive,
@@ -169,7 +170,7 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC 
                    R.string.usage_type_radio_active,

                };

                values = new double[] {

                    entry.sipper.usageTimeMs,

                    entry.sipper.usageTime,

                    entry.sipper.noCoveragePercent,

                    entry.sipper.mobileActive

                };
@@ -188,10 +189,10 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC 
                    R.string.usage_type_data_wifi_send,

                };

                values = new double[] {

                    entry.sipper.usageTimeMs,

                    entry.sipper.cpuTimeMs,

                    entry.sipper.cpuFgTimeMs,

                    entry.sipper.wakeLockTimeMs,

                    entry.sipper.usageTime,

                    entry.sipper.cpuTime,

                    entry.sipper.cpuFgTime,

                    entry.sipper.wakeLockTime,

                    entry.sipper.mobileRxPackets,

                    entry.sipper.mobileTxPackets,

                    entry.sipper.wifiRxPackets,
@@ -211,10 +212,10 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC 
                    R.string.usage_type_data_wifi_send,

                };

                values = new double[] {

                    entry.sipper.usageTimeMs,

                    entry.sipper.cpuTimeMs,

                    entry.sipper.cpuFgTimeMs,

                    entry.sipper.wakeLockTimeMs,

                    entry.sipper.usageTime,

                    entry.sipper.cpuTime,

                    entry.sipper.cpuFgTime,

                    entry.sipper.wakeLockTime,

                    entry.sipper.mobileRxPackets,

                    entry.sipper.mobileTxPackets,

                    entry.sipper.wifiRxPackets,
@@ -253,7 +254,7 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC 
                    R.string.usage_type_on_time

                };

                values = new double[] {

                    entry.sipper.usageTimeMs

                    entry.sipper.usageTime

                };

            }

        }

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

+6 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Message; 
import android.os.UserHandle;

import android.os.UserManager;

import android.preference.Preference;

import android.preference.PreferenceFragment;

import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.text.TextUtils;
@@ -277,18 +278,18 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment { 
            final int numSippers = usageList.size();

            for (int i = 0; i < numSippers; i++) {

                final BatterySipper sipper = usageList.get(i);

                if ((sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {

                if ((sipper.value * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP) {

                    continue;

                }

                final double percentOfTotal =

                        ((sipper.totalPowerMah / mStatsHelper.getTotalPower()) * dischargeAmount);

                        ((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);

                if (((int) (percentOfTotal + .5)) < 1) {

                    continue;

                }

                if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) {

                    // Don't show over-counted unless it is at least 2/3 the size of

                    // the largest real entry, and its percent of total is more significant

                    if (sipper.totalPowerMah < ((mStatsHelper.getMaxRealPower()*2)/3)) {

                    if (sipper.value < ((mStatsHelper.getMaxRealPower()*2)/3)) {

                        continue;

                    }

                    if (percentOfTotal < 10) {
@@ -301,7 +302,7 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment { 
                if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) {

                    // Don't show over-counted unless it is at least 1/2 the size of

                    // the largest real entry, and its percent of total is more significant

                    if (sipper.totalPowerMah < (mStatsHelper.getMaxRealPower()/2)) {

                    if (sipper.value < (mStatsHelper.getMaxRealPower()/2)) {

                        continue;

                    }

                    if (percentOfTotal < 5) {
@@ -320,7 +321,7 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment { 
                final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),

                        badgedIcon, contentDescription, entry);



                final double percentOfMax = (sipper.totalPowerMah * 100) / mStatsHelper.getMaxPower();

                final double percentOfMax = (sipper.value * 100) / mStatsHelper.getMaxPower();

                sipper.percent = percentOfTotal;

                pref.setTitle(entry.getLabel());

                pref.setOrder(i + 1);