From f08185b8e374af678edfbec33b0f4551e383e366 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 4 Sep 2015 10:36:57 -0400 Subject: [PATCH] Differentiate battery optimization string. Bug: 23585186 Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085 --- res/values/strings.xml | 2 +- src/com/android/settings/fuelgauge/HighPowerDetail.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index c87cc30def6..09fe8255337 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6740,7 +6740,7 @@ Not optimized - Ignoring battery optimization + Not optimized Optimizing battery use diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 908666ba3c4..6946f62f18e 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -143,7 +143,7 @@ public class HighPowerDetail extends DialogFragment implements OnClickListener, public static CharSequence getSummary(Context context, String pkg) { PowerWhitelistBackend powerWhitelist = PowerWhitelistBackend.getInstance(); return context.getString(powerWhitelist.isSysWhitelisted(pkg) ? R.string.high_power_system - : powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_filter_on + : powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_on : R.string.high_power_off); }