diff options
author | Yorke Lee <yorkelee@google.com> | 2014-11-21 12:18:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 12:18:32 +0000 |
commit | 85edae455bdef7e5e393d7d451478fe7530868b9 (patch) | |
tree | d54f0fdc0423c76e44a25f1b193bf30b173afbb8 /src | |
parent | 78ab71eca0b8562fe280eae9ad8744c620de1ebc (diff) | |
parent | 44e56fa887be5f859c4d8f7e215509f91172f160 (diff) |
am 44e56fa8: am 45239c84: am f15a2837: Use REDIAL instead of CALL BACK for outgoing calls
* commit '44e56fa887be5f859c4d8f7e215509f91172f160':
Use REDIAL instead of CALL BACK for outgoing calls
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 11 |
1 files changed, 10 insertions, 1 deletions
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); |