diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-11-21 02:40:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 02:40:15 +0000 |
| commit | 45239c84ffbe599d6d5a5335236ec470b2e94e11 (patch) | |
| tree | 5406e7018f194b03bd1ca008a9a64a1920dca790 | |
| parent | d896f661e370b59fae65b9be6ce52c88e9fb4a42 (diff) | |
| parent | f15a2837370b0852dffb464843f3f020ebffa94b (diff) | |
am f15a2837: Use REDIAL instead of CALL BACK for outgoing calls
* commit 'f15a2837370b0852dffb464843f3f020ebffa94b':
Use REDIAL instead of CALL BACK for outgoing calls
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b645f2711..8c36ec75d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -549,7 +549,7 @@ is used to describe the action of calling a phone number. Tapping causes a call to be placed to the number represented by the call log entry. [CHAR LIMIT=30] --> - <string name="call_log_action_redial">CALL</string> + <string name="call_log_action_call">CALL</string> <!-- BUTTON text for the "redial" button displayed underneath an entry in the call log. This is used to describe the action of calling a phone number that the user previously made an diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 99bf38615..9528e4507 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -982,7 +982,8 @@ public class CallLogAdapter extends GroupingListAdapter } /*** - * Binds click handlers and intents to the voicemail, details and callback action buttons. + * Binds text titles, click handlers and intents to the voicemail, details and callback action + * buttons. * * @param views The call log item views. */ @@ -1005,6 +1006,14 @@ public class CallLogAdapter extends GroupingListAdapter } views.callBackButtonView.setVisibility(View.VISIBLE); views.callBackButtonView.setOnClickListener(mActionListener); + + final int titleId; + if (views.callType == Calls.VOICEMAIL_TYPE || views.callType == Calls.OUTGOING_TYPE) { + titleId = R.string.call_log_action_redial; + } else { + titleId = R.string.call_log_action_call_back; + } + views.callBackButtonView.setText(mContext.getString(titleId)); } else { // Number is not callable, so hide button. views.callBackButtonView.setTag(null); |