PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 05407e77: am 733bd437: Merge "Internationalize bytes and percentages." into jb-mr1.1-dev

Browse Source 
* commit '05407e77e060e8b62a197065538e44a2b0cf8e38':
  Internationalize bytes and percentages.
This commit is contained in:
Jeff Sharkey
2012-11-15 11:50:11 -08:00
committed by Android Git Automerger
parent 8f7d5cac7a 05407e77e0
commit 282aacb5c3
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/fuelgauge/PowerUsageDetail.java
View File

@@ -34,10 +34,10 @@ import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process; import android.os.Process;
import android.os.UserHandle;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.Formatter;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -310,10 +310,12 @@ public class PowerUsageDetail extends Fragment implements Button.OnClickListener
switch (mTypes[i]) { switch (mTypes[i]) {
case R.string.usage_type_data_recv: case R.string.usage_type_data_recv:
case R.string.usage_type_data_send: case R.string.usage_type_data_send:
value = Utils.formatBytes(getActivity(), mValues[i]); final long bytes = (long) (mValues[i]);
value = Formatter.formatFileSize(getActivity(), bytes);
break; break;
case R.string.usage_type_no_coverage: case R.string.usage_type_no_coverage:
value = String.format("%d%%", (int) Math.floor(mValues[i])); final int percentage = (int) Math.floor(mValues[i]);
value = getActivity().getString(R.string.percentage, percentage);
break; break;
case R.string.usage_type_gps: case R.string.usage_type_gps:
mUsesGps = true; mUsesGps = true;

17
src/com/android/settings/fuelgauge/Utils.java
View File

@@ -64,21 +64,4 @@ public class Utils {
} }
return sb.toString(); return sb.toString();
} }
/**
* Formats data size in KB, MB, from the given bytes.
* @param context the application context
* @param bytes data size in bytes
* @return the formatted size such as 4.52 MB or 245 KB or 332 bytes
*/
public static String formatBytes(Context context, double bytes) {
// TODO: I18N
if (bytes > 1000 * 1000) {
return String.format("%.2f MB", ((int) (bytes / 1000)) / 1000f);
} else if (bytes > 1024) {
return String.format("%.2f KB", ((int) (bytes / 10)) / 100f);
} else {
return String.format("%d bytes", (int) bytes);
}
}
} }