From 6588a82823cf81a9aff3c18045b51844fb015c8a Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Fri, 12 Jun 2015 20:54:16 -0700
Subject: [PATCH] dex2oat should show something friendlier in Settings ->
 Battery

Bug: 13161823
Change-Id: If68d91900c88f33f5656a9e336633d53a5e900ce
---
 res/values/strings.xml                               | 6 ++++--
 src/com/android/settings/fuelgauge/BatteryEntry.java | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a61aa07970..e0cb8301f82 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4296,10 +4296,12 @@
     <!-- Menu label for refreshing with latest usage numbers -->
     <string name="menu_stats_refresh">Refresh</string>
 
-    <!-- Label for kernel threads -->
+    <!-- Label for kernel threads in battery usage -->
     <string name="process_kernel_label">Android OS</string>
-    <!-- Label for mediaserver process -->
+    <!-- Label for mediaserver process in battery usage -->
     <string name="process_mediaserver_label">Mediaserver</string>
+    <!-- Label for dex2oat process used for app optimization in battery usage -->
+    <string name="process_dex2oat_label">App optimization</string>
 
     <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
     <string name="battery_saver">Battery saver</string>
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 8227c7134a2..edab72978ee 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -225,6 +225,8 @@ public class BatteryEntry {
                 name = context.getResources().getString(R.string.process_kernel_label);
             } else if ("mediaserver".equals(name)) {
                 name = context.getResources().getString(R.string.process_mediaserver_label);
+            } else if ("dex2oat".equals(name)) {
+                name = context.getResources().getString(R.string.process_dex2oat_label);
             }
             iconId = R.drawable.ic_power_system;
             icon = context.getDrawable(iconId);