PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update name of field used from BatterySipper"

Browse Source 
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 a74ddc29b8.

Change-Id: I8e6f2f48d930db9db7eae1a07492da91b0c38f88
This commit is contained in:
Bart Sears
2015-04-07 06:15:25 +00:00
parent a74ddc29b8
commit 86c99e28e9
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.Utils.prepareCustomPreferencesList;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ApplicationErrorReport; import android.app.ApplicationErrorReport;
import android.app.Fragment;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
@@ -92,9 +93,9 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name); args.putString(PowerUsageDetail.EXTRA_TITLE, entry.name);
args.putInt(PowerUsageDetail.EXTRA_PERCENT, (int) 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) 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.putLong(PowerUsageDetail.EXTRA_USAGE_DURATION, helper.getStatsPeriod());
args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName); args.putString(PowerUsageDetail.EXTRA_ICON_PACKAGE, entry.defaultPackageName);
args.putInt(PowerUsageDetail.EXTRA_ICON_ID, entry.iconId); 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, R.string.usage_type_video,
}; };
values = new double[] { values = new double[] {
entry.sipper.cpuTimeMs, entry.sipper.cpuTime,
entry.sipper.cpuFgTimeMs, entry.sipper.cpuFgTime,
entry.sipper.wakeLockTimeMs, entry.sipper.wakeLockTime,
entry.sipper.gpsTimeMs, entry.sipper.gpsTime,
entry.sipper.wifiRunningTimeMs, entry.sipper.wifiRunningTime,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.mobileActive, entry.sipper.mobileActive,
@@ -169,7 +170,7 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_radio_active, R.string.usage_type_radio_active,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs, entry.sipper.usageTime,
entry.sipper.noCoveragePercent, entry.sipper.noCoveragePercent,
entry.sipper.mobileActive entry.sipper.mobileActive
}; };
@@ -188,10 +189,10 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_data_wifi_send, R.string.usage_type_data_wifi_send,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs, entry.sipper.usageTime,
entry.sipper.cpuTimeMs, entry.sipper.cpuTime,
entry.sipper.cpuFgTimeMs, entry.sipper.cpuFgTime,
entry.sipper.wakeLockTimeMs, entry.sipper.wakeLockTime,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
@@ -211,10 +212,10 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_data_wifi_send, R.string.usage_type_data_wifi_send,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs, entry.sipper.usageTime,
entry.sipper.cpuTimeMs, entry.sipper.cpuTime,
entry.sipper.cpuFgTimeMs, entry.sipper.cpuFgTime,
entry.sipper.wakeLockTimeMs, entry.sipper.wakeLockTime,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
@@ -253,7 +254,7 @@ public class PowerUsageDetail extends InstrumentedFragment implements Button.OnC
R.string.usage_type_on_time R.string.usage_type_on_time
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs entry.sipper.usageTime
}; };
} }
} }

11
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -30,6 +30,7 @@ import android.os.Message;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup; import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.text.TextUtils; import android.text.TextUtils;
@@ -277,18 +278,18 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment {
final int numSippers = usageList.size(); final int numSippers = usageList.size();
for (int i = 0; i < numSippers; i++) { for (int i = 0; i < numSippers; i++) {
final BatterySipper sipper = usageList.get(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; continue;
} }
final double percentOfTotal = final double percentOfTotal =
((sipper.totalPowerMah / mStatsHelper.getTotalPower()) * dischargeAmount); ((sipper.value / mStatsHelper.getTotalPower()) * dischargeAmount);
if (((int) (percentOfTotal + .5)) < 1) { if (((int) (percentOfTotal + .5)) < 1) {
continue; continue;
} }
if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) { if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) {
// Don't show over-counted unless it is at least 2/3 the size of // 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 // 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; continue;
} }
if (percentOfTotal < 10) { if (percentOfTotal < 10) {
@@ -301,7 +302,7 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment {
if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) { if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) {
// Don't show over-counted unless it is at least 1/2 the size of // 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 // 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; continue;
} }
if (percentOfTotal < 5) { if (percentOfTotal < 5) {
@@ -320,7 +321,7 @@ public class PowerUsageSummary extends InstrumentedPreferenceFragment {
final PowerGaugePreference pref = new PowerGaugePreference(getActivity(), final PowerGaugePreference pref = new PowerGaugePreference(getActivity(),
badgedIcon, contentDescription, entry); badgedIcon, contentDescription, entry);
final double percentOfMax = (sipper.totalPowerMah * 100) / mStatsHelper.getMaxPower(); final double percentOfMax = (sipper.value * 100) / mStatsHelper.getMaxPower();
sipper.percent = percentOfTotal; sipper.percent = percentOfTotal;
pref.setTitle(entry.getLabel()); pref.setTitle(entry.getLabel());
pref.setOrder(i + 1); pref.setOrder(i + 1);