diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-15 00:13:46 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-15 00:13:47 +0000 |
commit | 8972a40fadbfc17800f2d0eaad9c23cf0a13ba4f (patch) | |
tree | 7bf424a312510d7749056c36a82f72388239c3f1 /InCallUI | |
parent | f7ea45b3ef1ff3fffcef33d7b969f43038be9731 (diff) | |
parent | f0518d7304d01183ad425e06415d78a675e1f97c (diff) |
Merge "Create new string for notification_action_answer" into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/values/strings.xml | 5 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/StatusBarNotifier.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index 38ae07bb0..157bf1c9a 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -171,6 +171,9 @@ <!-- Label for the expanded "No service" notification item, including the operator name set by user --> <string name="notification_network_selection_text">Selected network (<xliff:g id="operator_name">%s</xliff:g>) unavailable</string> + <!-- Label for the "Answer call" action. This is the displayed label for the action that answers + an incoming call. [CHAR LIMIT=12] --> + <string name="notification_action_answer">Answer</string> <!-- Label for "end call" Action. It is displayed in the "Ongoing call" notification, which is shown when the user is outside the in-call screen while the phone call is still @@ -470,7 +473,7 @@ <!-- String used by AccessibilityService to announce that the call has been removed from hold [CHAR LIMIT=NONE]--> <string name="accessibility_call_removed_from_hold">Call removed from hold.</string> - <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=12] --> + <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] --> <string name="description_target_answer">Answer</string> <!-- Description of the send_sms target in the Slide unlock screen of Phone. [CHAR LIMIT=NONE] --> <string name="description_target_send_sms">Send SMS</string> diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java index 59add80c0..d60cd5f85 100644 --- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java +++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java @@ -492,7 +492,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener { PendingIntent answerVoicePendingIntent = createNotificationPendingIntent( mContext, InCallApp.ACTION_ANSWER_VOICE_INCOMING_CALL); builder.addAction(R.drawable.ic_call_white_24dp, - mContext.getText(R.string.description_target_answer), + mContext.getText(R.string.notification_action_answer), answerVoicePendingIntent); } |