commit 477296898777d0bdf41fc49c047a6b9374f27fe1
author The Android Open Source Project <initial-contribution@android.com> Thu Feb 19 10:57:36 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Feb 19 10:57:36 2009 -0800
tree ceeaa6b84892801d426ba3792238a1993ae73ff5
parent b9f5851434b568fa427613fbc00e0b4cf9e15132

auto import from //branches/cupcake/...@132276

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7236353..019755a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -147,19 +147,17 @@
     <string-array name="battery_history_type_spinner">
         <item>CPU Usage</item>
         <item>Network Usage</item>
+        <item>GPS Usage</item>
         <item>Sensor Usage</item>
-        <item>Screen On Time</item>
-<!--
         <item>Wake Locks</item>
--->
+        <item>Screen On Time</item>
     </string-array>
 
     <!-- Match with constants in BatteryStats class -->
     <string-array name="battery_history_which_spinner">
-        <item>Since device reset</item>
-        <item>Before last boot</item>
-        <item>Since last boot</item>
         <item>Since last unplugged</item>
+        <item>Total since boot</item>
+        <item>Total in all time</item>
     </string-array>
 
     <!-- Display options for UsageStats class -->