Merge "Differentiate battery optimization string."

This commit is contained in:
Julia Reynolds
2015-09-08 17:14:02 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -6755,7 +6755,7 @@
<string name="high_power_filter_on">Not optimized</string>
<!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
<string name="high_power_on">Ignoring battery optimization</string>
<string name="high_power_on">Not optimized</string>
<!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
<string name="high_power_off">Optimizing battery use</string>

View File

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