From 6ca8c72289f7bbaab3bf0ae3a37cc26d9cb93923 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 29 Mar 2018 10:19:58 -0700 Subject: Replace png icons with vector drawable for video call screen. Bug: 76221932 Test: manual PiperOrigin-RevId: 190948113 Change-Id: I4151ab3fc5231183d49fc1bdc247a09e5ffadc22 --- .../speakerbuttonlogic/SpeakerButtonInfo.java | 27 +++++----------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java') diff --git a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java index 5ab821be0..58fd40fb4 100644 --- a/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java +++ b/java/com/android/incallui/speakerbuttonlogic/SpeakerButtonInfo.java @@ -42,7 +42,7 @@ public class SpeakerButtonInfo { public final boolean checkable; public final boolean isChecked; - public SpeakerButtonInfo(CallAudioState audioState, @IconSize int iconSize) { + public SpeakerButtonInfo(CallAudioState audioState) { if ((audioState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH) == CallAudioState.ROUTE_BLUETOOTH) { checkable = false; @@ -51,40 +51,25 @@ public class SpeakerButtonInfo { if ((audioState.getRoute() & CallAudioState.ROUTE_BLUETOOTH) == CallAudioState.ROUTE_BLUETOOTH) { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_bluetooth_audio_white_36 - : R.drawable.quantum_ic_bluetooth_audio_white_24; + icon = R.drawable.quantum_ic_bluetooth_audio_vd_theme_24; contentDescription = R.string.incall_content_description_bluetooth; } else if ((audioState.getRoute() & CallAudioState.ROUTE_SPEAKER) == CallAudioState.ROUTE_SPEAKER) { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_volume_up_white_36 - : R.drawable.quantum_ic_volume_up_white_24; + icon = R.drawable.quantum_ic_volume_up_vd_theme_24; contentDescription = R.string.incall_content_description_speaker; } else if ((audioState.getRoute() & CallAudioState.ROUTE_WIRED_HEADSET) == CallAudioState.ROUTE_WIRED_HEADSET) { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_headset_white_36 - : R.drawable.quantum_ic_headset_white_24; + icon = R.drawable.quantum_ic_headset_vd_theme_24; contentDescription = R.string.incall_content_description_headset; } else { - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_phone_in_talk_white_36 - : R.drawable.quantum_ic_phone_in_talk_white_24; + icon = R.drawable.quantum_ic_phone_in_talk_vd_theme_24; contentDescription = R.string.incall_content_description_earpiece; } } else { checkable = true; isChecked = audioState.getRoute() == CallAudioState.ROUTE_SPEAKER; label = R.string.incall_label_speaker; - icon = - iconSize == IconSize.SIZE_36_DP - ? R.drawable.quantum_ic_volume_up_white_36 - : R.drawable.quantum_ic_volume_up_white_24; + icon = R.drawable.quantum_ic_volume_up_vd_theme_24; contentDescription = R.string.incall_content_description_speaker; } } -- cgit v1.2.3