diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ca1628dc21..7b9f77c2402 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4527,6 +4527,8 @@
     <string name="power_last_full_charge_summary"><xliff:g id="time">^1</xliff:g> ago</string>
     <!-- Label for list of apps using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
     <string name="power_usage_list_summary">App usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
+    <!-- Label for device components using battery in power use UI. Note: ^1 should be used in all translations[CHAR_LIMIT=120] -->
+    <string name="power_usage_list_summary_device">Device usage since full charge (<xliff:g id="time">^1</xliff:g> ago)</string>
     <!-- Description for the screen usage item [CHAR_LIMIT=120] -->
     <string name="screen_usage_summary">Amount of time screen has been on since full charge</string>
     <!-- Label for list of different types using battery in power use UI [CHAR_LIMIT=60] -->
@@ -7440,11 +7442,11 @@
     <!-- Label for menu to launch a screen showing usage alerts for battery [CHAR LIMIT=30] -->
     <string name="additional_battery_info">Usage alerts</string>
 
-    <!-- Label for menu to show all apps in battery settings [CHAR LIMIT=30] -->
-    <string name="show_all_apps">Show all apps</string>
+    <!-- Label for menu to show battery usage in the device [CHAR LIMIT=45] -->
+    <string name="show_all_apps">Show full device usage</string>
 
-    <!-- Label for menu to hide extra apps in battery settings [CHAR LIMIT=30] -->
-    <string name="hide_extra_apps">Hide extra apps</string>
+    <!-- Label for menu to show app usage [CHAR LIMIT=30] -->
+    <string name="hide_extra_apps">Show app usage</string>
 
     <!-- Title for high usage item, which means power high usage [CHAR LIMIT=30] -->
     <string name="power_high_usage_title">High usage</string>
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 27aa52f91c7..cac4e90b6cd 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -503,8 +503,9 @@ public class PowerUsageSummary extends PowerUsageBase implements
         updateLastFullChargePreference(runningTime);
 
         final CharSequence timeSequence = Utils.formatElapsedTime(context, runningTime, false);
-        mAppListGroup.setTitle(
-                TextUtils.expandTemplate(getText(R.string.power_usage_list_summary), timeSequence));
+        final int resId = mShowAllApps ? R.string.power_usage_list_summary_device
+                : R.string.power_usage_list_summary;
+        mAppListGroup.setTitle(TextUtils.expandTemplate(getText(resId), timeSequence));
 
         refreshAppListGroup();
     }