Merge "Update strings in battery settings." into pi-dev am: faa5c2281e

am: 37a0f5cf7d

Change-Id: I55da31048dd2804198272f8016e135860a5433ee
This commit is contained in:
Lei Yu
2018-05-10 16:54:00 -07:00
committed by android-build-merger
4 changed files with 7 additions and 19 deletions

View File

@@ -94,10 +94,7 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
return new AlertDialog.Builder(context)
.setMessage(getString(R.string.battery_tip_dialog_message,
highUsageTip.getHighUsageAppList().size(),
StringUtil.formatRelativeTime(context,
highUsageTip.getLastFullChargeTimeMs(),
false /* withSeconds */)))
highUsageTip.getHighUsageAppList().size()))
.setView(view)
.setPositiveButton(android.R.string.ok, null)
.create();