diff options
| author | blong <blong@codeaurora.org> | 2014-03-03 14:27:41 +0800 |
|---|---|---|
| committer | emancebo <emancebo@cyngn.com> | 2014-09-03 16:58:12 -0700 |
| commit | 4b6daf78d2aceea24d6db4f40c00c992962e75cd (patch) | |
| tree | a89d53bbd3a1765a5134176464ef15ceafc93305 /res | |
| parent | 7c9a2e0c09917adcb55e032de55d72e6c4016dcb (diff) | |
| download | android_packages_apps_Dialer-4b6daf78d2aceea24d6db4f40c00c992962e75cd.tar.gz android_packages_apps_Dialer-4b6daf78d2aceea24d6db4f40c00c992962e75cd.tar.bz2 android_packages_apps_Dialer-4b6daf78d2aceea24d6db4f40c00c992962e75cd.zip | |
Add the duration type for call time in call log
- use a config to control whether need to display call duration
type in call log.
Conflicts:
res/values/config.xml
src/com/android/dialer/CallDetailActivity.java
src/com/android/dialer/PhoneCallDetails.java
src/com/android/dialer/calllog/CallLogAdapter.java
tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
Change-Id: I8346aa8006dc48c541a859152cdb7097dfd6f5fe
Diffstat (limited to 'res')
| -rwxr-xr-x | res/values-zh-rCN/strings.xml | 2 | ||||
| -rw-r--r-- | res/values-zh-rTW/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/config.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
4 files changed, 8 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index a66620de4..8844089fb 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -48,6 +48,8 @@ <string name="call_log_incoming_header" msgid="2787722299753674684">"只显示来电"</string> <string name="call_log_outgoing_header" msgid="761009180766735769">"只显示外拨电话"</string> <string name="call_log_missed_header" msgid="8017148056610855956">"只显示未接来电"</string> + <string name="call_duration_active">"通话时长:"</string> + <string name="call_duration_call_out">"呼叫时长:"</string> <string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"无法连接到语音信箱服务器。"</string> <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"无法连接到语音信箱服务器。新的语音邮件正在等待接收。"</string> <string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"设置您的语音信箱。"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index c3ee7189b..bb84dd9b9 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -48,6 +48,8 @@ <string name="call_log_incoming_header" msgid="2787722299753674684">"僅顯示來電"</string> <string name="call_log_outgoing_header" msgid="761009180766735769">"僅顯示已撥電話"</string> <string name="call_log_missed_header" msgid="8017148056610855956">"僅顯示未接來電"</string> + <string name="call_duration_active">"通話時長:"</string> + <string name="call_duration_call_out">"呼叫時長:"</string> <string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"無法連線至語音信箱伺服器。"</string> <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"無法連線至語音信箱伺服器，新的語音留言仍待聽取。"</string> <string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"設定您的語音信箱。"</string> diff --git a/res/values/config.xml b/res/values/config.xml index e8b6eca2b..318916dfa 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -17,4 +17,5 @@ <resources> <bool name="call_recording_enabled">false</bool> <integer name="call_recording_audio_source">1</integer> + <bool name="call_durationtype_enabled">false</bool> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1e9988756..c58e916e3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -133,6 +133,9 @@ <!-- The header to show that call log is only showing missed calls. [CHAR LIMIT=40] --> <string name="call_log_missed_header">Missed calls only</string> + <string name="call_duration_active">Active duration:</string> + <string name="call_duration_call_out">Call duration:</string> + <!-- Voicemail status message shown at the top of call log to notify the user that no new voicemails are currently available. This can happen when both notification as well as data connection to the voicemail server is lost. [CHAR LIMIT=64] --> |