am 5b1238df: am 73be4a04: Merge "Call log duration display for calls less than a minute." into mnc-dev
* commit '5b1238df5a5328b9ae6df86ea820148b46c6bbff':
Call log duration display for calls less than a minute.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d8a8ffe..b852be8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -390,6 +390,9 @@
<!-- String used to display calls from pay phone in the call log -->
<string name="payphone">Payphone</string>
+ <!-- A nicely formatted call duration displayed when viewing call details for duration less than 1 minute. For example "28 sec" -->
+ <string name="callDetailsShortDurationFormat"><xliff:g id="seconds" example="28">%s</xliff:g> sec</string>
+
<!-- A nicely formatted call duration displayed when viewing call details. For example "42 min 28 sec" -->
<string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%s</xliff:g> min <xliff:g id="seconds" example="28">%s</xliff:g> sec</string>
diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
index d53f77f..3b488a8 100644
--- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
+++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
@@ -153,10 +153,12 @@
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);
}
/**