From 8dc242deac3ef9f96f0ab7de0048477dd64b6a32 Mon Sep 17 00:00:00 2001 From: linyuh Date: Wed, 28 Mar 2018 13:09:47 -0700 Subject: Replace assets "quantum_ic_videocam_white_24" with a vector asset. Test: Existing tests PiperOrigin-RevId: 190820867 Change-Id: I4835bcbc7698075fb54015dccc6823ada4c71651 --- .../res/drawable-hdpi/quantum_ic_videocam_white_24.png | Bin 173 -> 0 bytes .../res/drawable-mdpi/quantum_ic_videocam_white_24.png | Bin 131 -> 0 bytes .../res/drawable-xhdpi/quantum_ic_videocam_white_24.png | Bin 178 -> 0 bytes .../res/drawable-xxhdpi/quantum_ic_videocam_white_24.png | Bin 234 -> 0 bytes .../res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png | Bin 290 -> 0 bytes .../dialer/app/res/layout/call_log_list_item_actions.xml | 6 +++--- .../android/dialer/calllogutils/CallTypeIconsView.java | 12 +++++++++--- .../android/dialer/historyitemactions/IntentModule.java | 2 +- .../searchfragment/cp2/SearchContactViewHolder.java | 2 +- .../dialer/speeddial/res/layout/favorite_item_layout.xml | 2 +- java/com/android/incallui/StatusBarNotifier.java | 8 ++++---- .../answer/impl/answermethod/FlingUpDownMethod.java | 2 +- 12 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png delete mode 100644 assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png delete mode 100644 assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png delete mode 100644 assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png delete mode 100644 assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png diff --git a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png deleted file mode 100644 index d83e0d50c..000000000 Binary files a/assets/quantum/res/drawable-hdpi/quantum_ic_videocam_white_24.png and /dev/null differ diff --git a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png deleted file mode 100644 index d146209a5..000000000 Binary files a/assets/quantum/res/drawable-mdpi/quantum_ic_videocam_white_24.png and /dev/null differ diff --git a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png deleted file mode 100644 index 1b2583d34..000000000 Binary files a/assets/quantum/res/drawable-xhdpi/quantum_ic_videocam_white_24.png and /dev/null differ diff --git a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png deleted file mode 100644 index 44c28e2f2..000000000 Binary files a/assets/quantum/res/drawable-xxhdpi/quantum_ic_videocam_white_24.png and /dev/null differ diff --git a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png b/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png deleted file mode 100644 index ed20c0706..000000000 Binary files a/assets/quantum/res/drawable-xxxhdpi/quantum_ic_videocam_white_24.png and /dev/null differ diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml index 7df0d1551..56d1daf6a 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml @@ -64,7 +64,7 @@ + android:src="@drawable/quantum_ic_videocam_vd_white_24"/> + android:src="@drawable/quantum_ic_videocam_vd_white_24"/> + android:src="@drawable/quantum_ic_videocam_vd_white_24"/> + android:src="@drawable/quantum_ic_videocam_vd_white_24"/> 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 { -- cgit v1.2.3