diff options
| author | Roshan Pius <rpius@google.com> | 2015-06-10 17:52:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-10 17:52:48 +0000 |
| commit | 5b1238df5a5328b9ae6df86ea820148b46c6bbff (patch) | |
| tree | 690a9045dc89502b10660984040ad68f6a7092b1 | |
| parent | e7e65a2047ee961d5a84d028c98f8b17f3f5e195 (diff) | |
| parent | 73be4a0455e6ceb3757c24889f138a0cdc3d5840 (diff) | |
| download | packages_apps_Dialer-5b1238df5a5328b9ae6df86ea820148b46c6bbff.tar.gz packages_apps_Dialer-5b1238df5a5328b9ae6df86ea820148b46c6bbff.tar.bz2 packages_apps_Dialer-5b1238df5a5328b9ae6df86ea820148b46c6bbff.zip | |
am 73be4a04: Merge "Call log duration display for calls less than a minute." into mnc-dev
* commit '73be4a0455e6ceb3757c24889f138a0cdc3d5840':
Call log duration display for calls less than a minute.
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallDetailHistoryAdapter.java | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index d8a8ffe19..b852be80d 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 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); } /** |