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

Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev

Browse Source
This commit is contained in:
Brian Carlstrom
2015-06-16 22:59:03 +00:00
committed by Android (Google) Code Review
parent 95b891af7c 6588a82823
commit 94f4cb4e46
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -4241,10 +4241,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>

2
src/com/android/settings/fuelgauge/BatteryEntry.java
View File

@@ -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);