diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-28 22:11:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-28 22:11:51 +0000 |
| commit | d72585b40d67560cb868c2ac4d6fbda2ed27454b (patch) | |
| tree | b6c2868ad7ce33d0923098be96dc9ebca01db185 /java/com/android/incallui | |
| parent | ae2c5425e43082c375981768f99dc56eab51269d (diff) | |
| parent | 23ad1e7cff3a2bc29fe6b71e8383e84421b1785f (diff) | |
Merge changes Iaf112cfe,I4835bcbc
* changes:
Update spam blocking promo wordings.
Replace assets "quantum_ic_videocam_white_24" with a vector asset.
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/StatusBarNotifier.java | 8 | ||||
| -rw-r--r-- | java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java index ef5965c09..503df6c88 100644 --- a/java/com/android/incallui/StatusBarNotifier.java +++ b/java/com/android/incallui/StatusBarNotifier.java @@ -647,7 +647,7 @@ public class StatusBarNotifier } else if (call.getVideoTech().getSessionModificationState() == SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST || call.isVideoCall()) { - return R.drawable.quantum_ic_videocam_white_24; + return R.drawable.quantum_ic_videocam_vd_white_24; } else if (call.hasProperty(PROPERTY_HIGH_DEF_AUDIO) && MotorolaUtils.shouldShowHdIconInNotification(context)) { // Normally when a call is ongoing the status bar displays an icon of a phone. This is a @@ -944,7 +944,7 @@ public class StatusBarNotifier createNotificationPendingIntent(context, ACTION_ANSWER_VIDEO_INCOMING_CALL); builder.addAction( new Notification.Action.Builder( - Icon.createWithResource(context, R.drawable.quantum_ic_videocam_white_24), + Icon.createWithResource(context, R.drawable.quantum_ic_videocam_vd_white_24), getActionText( R.string.notification_action_answer_video, R.color.notification_action_answer_video), @@ -960,7 +960,7 @@ public class StatusBarNotifier createNotificationPendingIntent(context, ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST); builder.addAction( new Notification.Action.Builder( - Icon.createWithResource(context, R.drawable.quantum_ic_videocam_white_24), + Icon.createWithResource(context, R.drawable.quantum_ic_videocam_vd_white_24), getActionText( R.string.notification_action_accept, R.color.notification_action_accept), acceptVideoPendingIntent) @@ -975,7 +975,7 @@ public class StatusBarNotifier createNotificationPendingIntent(context, ACTION_DECLINE_VIDEO_UPGRADE_REQUEST); builder.addAction( new Notification.Action.Builder( - Icon.createWithResource(context, R.drawable.quantum_ic_videocam_white_24), + Icon.createWithResource(context, R.drawable.quantum_ic_videocam_vd_white_24), getActionText( R.string.notification_action_dismiss, R.color.notification_action_dismiss), declineVideoPendingIntent) diff --git a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java index 2eeecc341..8928dd65e 100644 --- a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java +++ b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java @@ -334,7 +334,7 @@ public class FlingUpDownMethod extends AnswerMethod implements OnProgressChanged return; } if (getParent().isVideoCall() || getParent().isVideoUpgradeRequest()) { - contactPuckIcon.setImageResource(R.drawable.quantum_ic_videocam_white_24); + contactPuckIcon.setImageResource(R.drawable.quantum_ic_videocam_vd_white_24); } else if (getParent().isRttCall()) { contactPuckIcon.setImageResource(R.drawable.quantum_ic_rtt_vd_theme_24); } else { |