Merge "Call log duration display for calls less than a minute." into mnc-dev

1 files changed, 5 insertions, 3 deletions

diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
index d53f77f8a..3b488a8ae 100644
--- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
+++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
@@ -153,10 +153,12 @@ public class CallDetailHistoryAdapter extends BaseAdapter {
         if (elapsedSeconds >= 60) {
             minutes = elapsedSeconds / 60;
             elapsedSeconds -= minutes * 60;
+            seconds = elapsedSeconds;
+            return mContext.getString(R.string.callDetailsDurationFormat, minutes, seconds);
+        } else {
+            seconds = elapsedSeconds;
+            return mContext.getString(R.string.callDetailsShortDurationFormat, seconds);
         }
-        seconds = elapsedSeconds;
-
-        return mContext.getString(R.string.callDetailsDurationFormat, minutes, seconds);
     }
 
     /**