commit 0f9ab453766bd20a26d3ce5dc8fbf233023ecd16
author Dianne Hackborn <hackbod@google.com> Fri Feb 28 02:03:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 28 02:03:16 2014 +0000
tree 08a0087f6490b5542b6b657ed5c46ae5f67f73d3
parent 47c5e9c831dcf43b1e874b2485147e7fe58da503
parent 3c741d2be8277b4ffd7e2d71853f74bba613ff51

Merge "Show new radio active times."

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 612677b..7a36ccc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3626,6 +3626,8 @@
     <string name="usage_type_data_send">Mobile packets sent</string>
     <!-- Label for mobile network data received [CHAR LIMIT=32] -->
     <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] -->
     <string name="usage_type_data_wifi_send">Wi\u2011Fi packets sent</string>
     <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->

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

diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index a1e7278..518fc0e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -116,6 +116,7 @@
                     R.string.usage_type_wifi_running,
                     R.string.usage_type_data_recv,
                     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_send,
                     R.string.usage_type_audio,
@@ -129,6 +130,7 @@
                     entry.sipper.wifiRunningTime,
                     entry.sipper.mobileRxPackets,
                     entry.sipper.mobileTxPackets,
+                    entry.sipper.mobileActive,
                     entry.sipper.wifiRxPackets,
                     entry.sipper.wifiTxPackets,
                     0,
@@ -157,11 +159,13 @@
             {
                 types = new int[] {
                     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[] {
                     entry.sipper.usageTime,
-                    entry.sipper.noCoveragePercent
+                    entry.sipper.noCoveragePercent,
+                    entry.sipper.mobileActive
                 };
             }
             break;