Merge "Show new radio active times."

This commit is contained in:
Dianne Hackborn
2014-02-28 02:03:15 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 2 deletions

View File

@@ -3626,6 +3626,8 @@
<string name="usage_type_data_send">Mobile packets sent</string> <string name="usage_type_data_send">Mobile packets sent</string>
<!-- Label for mobile network data received [CHAR LIMIT=32] --> <!-- Label for mobile network data received [CHAR LIMIT=32] -->
<string name="usage_type_data_recv">Mobile packets received</string> <string name="usage_type_data_recv">Mobile packets received</string>
<!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
<string name="usage_type_radio_active">Mobile radio active</string>
<!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] --> <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
<string name="usage_type_data_wifi_send">Wi\u2011Fi packets sent</string> <string name="usage_type_data_wifi_send">Wi\u2011Fi packets sent</string>
<!-- Label for Wi-Fi network data received [CHAR LIMIT=32] --> <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->

View File

@@ -116,6 +116,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
R.string.usage_type_wifi_running, R.string.usage_type_wifi_running,
R.string.usage_type_data_recv, R.string.usage_type_data_recv,
R.string.usage_type_data_send, R.string.usage_type_data_send,
R.string.usage_type_radio_active,
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_audio, R.string.usage_type_audio,
@@ -129,6 +130,7 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
entry.sipper.wifiRunningTime, entry.sipper.wifiRunningTime,
entry.sipper.mobileRxPackets, entry.sipper.mobileRxPackets,
entry.sipper.mobileTxPackets, entry.sipper.mobileTxPackets,
entry.sipper.mobileActive,
entry.sipper.wifiRxPackets, entry.sipper.wifiRxPackets,
entry.sipper.wifiTxPackets, entry.sipper.wifiTxPackets,
0, 0,
@@ -157,11 +159,13 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
{ {
types = new int[] { types = new int[] {
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,
}; };
values = new double[] { values = new double[] {
entry.sipper.usageTime, entry.sipper.usageTime,
entry.sipper.noCoveragePercent entry.sipper.noCoveragePercent,
entry.sipper.mobileActive
}; };
} }
break; break;