diff options
-rw-r--r-- | res/values-ca/cm_arrays.xml | 28 | ||||
-rw-r--r-- | res/values-zh-rCN/cm_strings.xml | 53 | ||||
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 11 |
3 files changed, 88 insertions, 4 deletions
diff --git a/res/values-ca/cm_arrays.xml b/res/values-ca/cm_arrays.xml new file mode 100644 index 000000000..c07f9204a --- /dev/null +++ b/res/values-ca/cm_arrays.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2013 The CyanogenMod Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="call_stats_duration"> + <item><xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item> + <item><xliff:g id="minutes" example="2 mins">%2$s</xliff:g></item> + <item><xliff:g id="minutes" example="2 mins">%2$s</xliff:g> <xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item> + <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g></item> + <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g> <xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item> + <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g> <xliff:g id="minutes" example="2 mins">%2$s</xliff:g></item> + <item><xliff:g id="hours" example="2 hrs">%1$s</xliff:g> <xliff:g id="minutes" example="2 mins">%2$s</xliff:g> <xliff:g id="seconds" example="2 secs">%3$s</xliff:g></item> + </string-array> +</resources> diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml new file mode 100644 index 000000000..63100a6de --- /dev/null +++ b/res/values-zh-rCN/cm_strings.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2013 The CyanogenMod Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Title bar for call stat detail screen --> + <string name="callStatsDetailTitle">通话统计数据详情</string> + <string name="call_stats">通话统计数据</string> + <string name="call_stats_refresh">刷新</string> + <string name="activity_title_call_stats">通话统计数据</string> + <string name="call_stats_nav_all">全部</string> + <string name="call_stats_nav_incoming">来电</string> + <string name="call_stats_nav_outgoing">呼出</string> + <string name="call_stats_nav_missed">未接</string> + <string name="call_stats_incoming">来电: <xliff:g id="percent">%d</xliff:g>%%</string> + <string name="call_stats_outgoing">呼出: <xliff:g id="percent">%d</xliff:g>%%</string> + <string name="call_stats_missed">未接</string> + <string name="call_stats_missed_percent">未接: <xliff:g id="percent">%d</xliff:g>%%</string> + <string name="call_stats_header_total">总计: <xliff:g id="call_count">%s</xliff:g>, <xliff:g id="duration">%s</xliff:g></string> + <string name="call_stats_header_total_callsonly">总计: <xliff:g id="call_count">%s</xliff:g></string> + <string name="call_stats_filter_from">开始日期</string> + <string name="call_stats_filter_to">结束日期</string> + <string name="call_stats_filter_picker_title">过滤范围</string> + + <string name="date_quick_selection">快速选择</string> + <string name="date_qs_currentmonth">本月</string> + <string name="date_qs_currentquarter">本季度</string> + <string name="date_qs_currentyear">本年</string> + <string name="date_qs_lastweek">上周</string> + <string name="date_qs_lastmonth">上个月</string> + <string name="date_qs_lastquarter">上个季度</string> + <string name="date_qs_lastyear">去年</string> + <string name="call_stats_date_filter">调整时间范围</string> + <string name="call_stats_reset_filter">重置时间范围</string> + <string name="call_stats_sort_by_duration">以通话时间排序</string> + <string name="call_stats_sort_by_count">以通话次数排序</string> + <string name="menu_add_to_blacklist">添加到黑名单</string> + <string name="toast_added_to_blacklist">%s 已添加到黑名单.</string> +</resources> diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 5f70312ff..c913a7098 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -43,6 +43,7 @@ import android.provider.Contacts.Intents.Insert; import android.provider.Contacts.People; import android.provider.Contacts.Phones; import android.provider.Contacts.PhonesColumns; +import android.provider.ContactsContract; import android.provider.Settings; import android.telephony.PhoneNumberUtils; import android.telephony.PhoneStateListener; @@ -1745,10 +1746,12 @@ public class DialpadFragment extends Fragment final SmartDialEntry entry = (SmartDialEntry) view.getTag(); if (entry == null) return false; // just in case. mClearDigitsOnStop = true; - // Show the phone number disambiguation dialog without using the primary - // phone number so that the user can decide which number to call - PhoneNumberInteraction.startInteractionForPhoneCall( - (TransactionSafeActivity) getActivity(), entry.contactUri, false); + // Show quick contact dialog so the user can decide which number + // to call or perform other operations + Intent intent = ContactsContract.QuickContact.composeQuickContactsIntent( + getActivity(), view, entry.contactUri, + ContactsContract.QuickContact.MODE_LARGE, null); + startActivity(intent); return true; } } |