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

Merge "Add computed power to each Battery Details page" into mnc-dev

Browse Source
This commit is contained in:
Adam Lesinski
2015-06-25 19:34:42 +00:00
committed by Android (Google) Code Review
parent fb6e1186ab 46b62233d4
commit 7217592dd1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
R.string.usage_type_video, R.string.usage_type_video,
R.string.usage_type_camera, R.string.usage_type_camera,
R.string.usage_type_flashlight, R.string.usage_type_flashlight,
R.string.usage_type_computed_power,
}; };
values = new double[] { values = new double[] {
entry.sipper.cpuTimeMs, entry.sipper.cpuTimeMs,
@@ -145,6 +146,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
0, 0,
entry.sipper.cameraTimeMs, entry.sipper.cameraTimeMs,
entry.sipper.flashlightTimeMs, entry.sipper.flashlightTimeMs,
entry.sipper.totalPowerMah,
}; };
if (entry.sipper.drainType == BatterySipper.DrainType.APP) { if (entry.sipper.drainType == BatterySipper.DrainType.APP) {
@@ -172,11 +174,13 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
R.string.usage_type_on_time, R.string.usage_type_on_time,
R.string.usage_type_no_coverage, R.string.usage_type_no_coverage,
R.string.usage_type_radio_active, R.string.usage_type_radio_active,
R.string.usage_type_computed_power,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs, entry.sipper.usageTimeMs,
entry.sipper.noCoveragePercent, entry.sipper.noCoveragePercent,
entry.sipper.mobileActive entry.sipper.mobileActive,
entry.sipper.totalPowerMah,
}; };
} }
break; break;
@@ -191,6 +195,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
R.string.usage_type_data_send, R.string.usage_type_data_send,
R.string.usage_type_data_wifi_recv, R.string.usage_type_data_wifi_recv,
R.string.usage_type_data_wifi_send, R.string.usage_type_data_wifi_send,
R.string.usage_type_computed_power,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs, entry.sipper.usageTimeMs,
@@ -201,6 +206,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
entry.sipper.wifiTxPackets, entry.sipper.wifiTxPackets,
entry.sipper.totalPowerMah,
}; };
} break; } break;
case BLUETOOTH: case BLUETOOTH:
@@ -214,6 +220,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
R.string.usage_type_data_send, R.string.usage_type_data_send,
R.string.usage_type_data_wifi_recv, R.string.usage_type_data_wifi_recv,
R.string.usage_type_data_wifi_send, R.string.usage_type_data_wifi_send,
R.string.usage_type_computed_power,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs, entry.sipper.usageTimeMs,
@@ -224,6 +231,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
entry.sipper.wifiTxPackets, entry.sipper.wifiTxPackets,
entry.sipper.totalPowerMah,
}; };
} break; } break;
case UNACCOUNTED: case UNACCOUNTED:
@@ -255,10 +263,12 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
default: default:
{ {
types = new int[] { types = new int[] {
R.string.usage_type_on_time R.string.usage_type_on_time,
R.string.usage_type_computed_power,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTimeMs entry.sipper.usageTimeMs,
entry.sipper.totalPowerMah,
}; };
} }
} }