diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-27 17:39:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-27 17:39:54 +0000 |
| commit | 08cb39837f02f37b854e7a4598d6f48d41d1ce94 (patch) | |
| tree | fbb3f8959a267e06a367f423dc882537cfe22e38 /src/com/android/settings | |
| parent | ca258251521350421883a79f741ff872103e0ff4 (diff) | |
| parent | c9eba1f2535edf3d2cdad7b7487163def90854fc (diff) | |
| download | packages_apps_Settings-08cb39837f02f37b854e7a4598d6f48d41d1ce94.zip packages_apps_Settings-08cb39837f02f37b854e7a4598d6f48d41d1ce94.tar.gz packages_apps_Settings-08cb39837f02f37b854e7a4598d6f48d41d1ce94.tar.bz2 | |
Merge "Update battery optimization strings" into mnc-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/fuelgauge/HighPowerDetail.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java index 859b5b8..6946f62 100644 --- a/src/com/android/settings/fuelgauge/HighPowerDetail.java +++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java @@ -79,7 +79,7 @@ public class HighPowerDetail extends DialogFragment implements OnClickListener, @Override public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder b = new AlertDialog.Builder(getContext()) - .setTitle(getString(R.string.ignore_optimizations_title, mLabel)) + .setTitle(mLabel) .setNegativeButton(R.string.cancel, null) .setView(R.layout.ignore_optimizations_content); if (!mBackend.isSysWhitelisted(mPackageName)) { @@ -141,8 +141,10 @@ public class HighPowerDetail extends DialogFragment implements OnClickListener, } public static CharSequence getSummary(Context context, String pkg) { - return context.getString(PowerWhitelistBackend.getInstance().isWhitelisted(pkg) - ? R.string.high_power_on : R.string.high_power_off); + PowerWhitelistBackend powerWhitelist = PowerWhitelistBackend.getInstance(); + return context.getString(powerWhitelist.isSysWhitelisted(pkg) ? R.string.high_power_system + : powerWhitelist.isWhitelisted(pkg) ? R.string.high_power_on + : R.string.high_power_off); } public static void show(Fragment caller, String packageName, int requestCode, |