summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-10-07 17:31:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-07 17:31:31 +0000
commit093e3eadae7fc10f801c063758c367bcfa592808 (patch)
treedfd0934264178b9c3a11d16ae813e3740e854d92
parentff4300e39752693a7c0b45cdf757987a7b725677 (diff)
parent158d484308c07121f0f8ebf9447c3b9e2f8d88a5 (diff)
am 60104e03: Use correctly sized answer icon and fix char limits
* commit '60104e03162bb5ecc52d07a79382134c3cdb1243': Use correctly sized answer icon and fix char limits
-rw-r--r--InCallUI/res/values/strings.xml12
-rw-r--r--InCallUI/src/com/android/incallui/StatusBarNotifier.java2
2 files changed, 7 insertions, 7 deletions
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 8e8a8e2bd..d174511c6 100644
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -174,21 +174,21 @@
<!-- 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
- active. [CHAR LIMIT=40] -->
+ active. [CHAR LIMIT=12] -->
<string name="notification_action_end_call">Hang up</string>
<!-- Label for "Video Call" notification action. This is a displayed on the notification for an
- incoming video call, and answers the call as a video call. [CHAR LIMIT=40] -->
+ incoming video call, and answers the call as a video call. [CHAR LIMIT=12] -->
<string name="notification_action_answer_video">Video</string>
<!-- Label for "Voice" notification action. This is a displayed on the notification for an
- incoming video call, and answers the call as an audio call. [CHAR LIMIT=40] -->
+ incoming video call, and answers the call as an audio call. [CHAR LIMIT=12] -->
<string name="notification_action_answer_voice">Voice</string>
<!-- Label for "Accept" notification action. This is somewhat generic, and may refer to
scenarios such as accepting an incoming call or accepting a video call request.
- [CHAR LIMIT=40] -->
+ [CHAR LIMIT=12] -->
<string name="notification_action_accept">Accept</string>
<!-- Label for "Dismiss" notification action. This is somewhat generic, and may refer to
scenarios such as declining an incoming call or declining a video call request.
- [CHAR LIMIT=40] -->
+ [CHAR LIMIT=12] -->
<string name="notification_action_dismiss">Dismiss</string>
<!-- Message for "call back" Action, which is displayed in the missed call notificaiton.
@@ -470,7 +470,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=NONE] -->
+ <!-- Description of the answer target in the Slide unlock screen of Phone. [CHAR LIMIT=12] -->
<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 4fa9c39ff..ce23a37db 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -491,7 +491,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
PendingIntent answerVoicePendingIntent = createNotificationPendingIntent(
mContext, InCallApp.ACTION_ANSWER_VOICE_INCOMING_CALL);
- builder.addAction(R.drawable.fab_ic_call,
+ builder.addAction(R.drawable.ic_call_white_24dp,
mContext.getText(R.string.description_target_answer),
answerVoicePendingIntent);
}