Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 92638a0c: am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev

Browse Source 
* commit '92638a0ca9c7c2125c624e457e79088b9892d4e0':
  BatteryStats: Use English locale for dump and checkin data
This commit is contained in:
Adam Lesinski
2015-07-24 03:06:22 +00:00
committed by Android Git Automerger
parent e4f10de7d2 92638a0ca9
commit 898e3dda94
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/com/android/internal/os/BatteryStatsHelper.java
View File

@@ -47,6 +47,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
/**
* A helper class for retrieving the power usage information for all applications and services.
@@ -267,15 +268,20 @@ public final class BatteryStatsHelper {
public static String makemAh(double power) {
if (power == 0) return "0";
else if (power < .00001) return String.format("%.8f", power);
else if (power < .0001) return String.format("%.7f", power);
else if (power < .001) return String.format("%.6f", power);
else if (power < .01) return String.format("%.5f", power);
else if (power < .1) return String.format("%.4f", power);
else if (power < 1) return String.format("%.3f", power);
else if (power < 10) return String.format("%.2f", power);
else if (power < 100) return String.format("%.1f", power);
else return String.format("%.0f", power);
final String format;
if (power < .00001) format = "%.8f";
else if (power < .0001) format = "%.7f";
else if (power < .001) format = "%.6f";
else if (power < .01) format = "%.5f";
else if (power < .1) format = "%.4f";
else if (power < 1) format = "%.3f";
else if (power < 10) format = "%.2f";
else if (power < 100) format = "%.1f";
else format = "%.0f";
// Use English locale because this is never used in UI (only in checkin and dump).
return String.format(Locale.ENGLISH, format, power);
}
/**