auto import from //branches/cupcake/...@125939

This commit is contained in:
The Android Open Source Project
2009-01-09 17:51:25 -08:00
parent abc48f80d8
commit 5962e18d0e
28 changed files with 2494 additions and 43 deletions

View File

@@ -184,8 +184,8 @@ public class BatteryInfo extends Activity {
if (mBatteryStats != null) {
try {
long awakeTimeBattery = mBatteryStats.getAwakeTimeBattery();
long awakeTimePluggedIn = mBatteryStats.getAwakeTimePlugged();
long awakeTimeBattery = mBatteryStats.getAwakeTimeBattery() / 1000;
long awakeTimePluggedIn = mBatteryStats.getAwakeTimePlugged() / 1000;
mAwakeBattery.setText(DateUtils.formatElapsedTime(awakeTimeBattery / 1000)
+ " (" + (100 * awakeTimeBattery / uptime) + "%)");
mAwakePlugged.setText(DateUtils.formatElapsedTime(awakeTimePluggedIn / 1000)