| commit | f8e781d07d6b4f29819619a92de756cc07567abb | [log] [tgz] |
|---|---|---|
| author | mindyp <mindyp@google.com> | Wed Aug 22 18:46:27 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 22 18:46:27 2012 -0700 |
| tree | 2bb9454a3f708b76b6803e01a6fb5be70398bc8c | |
| parent | 4205631516cc7f7cb1274f064f39c1431fcf3f40 [diff] | |
| parent | 1eea8e00a944bce60d4a136587113232460fd6dd [diff] |
Merge "If the size is 0, dont show anything." into jb-ub-mail
diff --git a/res/drawable-hdpi/default_image.9.png b/res/drawable-hdpi/default_image.9.png index 1514f6f..cccd75e 100644 --- a/res/drawable-hdpi/default_image.9.png +++ b/res/drawable-hdpi/default_image.9.png Binary files differ
diff --git a/res/drawable-mdpi/default_image.9.png b/res/drawable-mdpi/default_image.9.png index 55d9f66..ac257dc 100644 --- a/res/drawable-mdpi/default_image.9.png +++ b/res/drawable-mdpi/default_image.9.png Binary files differ
diff --git a/res/drawable-xhdpi/default_image.9.png b/res/drawable-xhdpi/default_image.9.png index 2771ff1..4b80f6c 100644 --- a/res/drawable-xhdpi/default_image.9.png +++ b/res/drawable-xhdpi/default_image.9.png Binary files differ
diff --git a/src/com/android/mail/utils/AttachmentUtils.java b/src/com/android/mail/utils/AttachmentUtils.java index ff9339b..2ab5767 100644 --- a/src/com/android/mail/utils/AttachmentUtils.java +++ b/src/com/android/mail/utils/AttachmentUtils.java
@@ -41,7 +41,9 @@ * depending on its size. */ public static String convertToHumanReadableSize(Context context, long size) { - if (size < KILO) { + if (size == 0) { + return ""; + } if (size < KILO) { return size + context.getString(R.string.bytes); } else if (size < MEGA) { return (size / KILO) + context.getString(R.string.kilobytes);
