diff options
Diffstat (limited to 'java/com/android')
3 files changed, 13 insertions, 11 deletions
diff --git a/java/com/android/incallui/incall/impl/ButtonController.java b/java/com/android/incallui/incall/impl/ButtonController.java index 5e37a492b..dd11fff33 100644 --- a/java/com/android/incallui/incall/impl/ButtonController.java +++ b/java/com/android/incallui/incall/impl/ButtonController.java @@ -293,7 +293,7 @@ interface ButtonController { R.string.incall_content_description_muted, R.string.incall_content_description_unmuted, R.string.incall_label_mute, - R.drawable.quantum_ic_mic_off_white_36); + R.drawable.quantum_ic_mic_off_vd_theme_24); } @Override @@ -312,7 +312,7 @@ interface ButtonController { private CheckableLabeledButton button; @StringRes private int label = R.string.incall_label_speaker; - @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_white_36; + @DrawableRes private int icon = R.drawable.quantum_ic_volume_up_vd_theme_24; private boolean checkable; private CharSequence contentDescription; private CharSequence checkedContentDescription; @@ -421,7 +421,7 @@ interface ButtonController { 0, 0, R.string.incall_label_dialpad, - R.drawable.quantum_ic_dialpad_white_36); + R.drawable.quantum_ic_dialpad_vd_theme_24); } @Override @@ -439,7 +439,7 @@ interface ButtonController { R.string.incall_content_description_unhold, R.string.incall_content_description_hold, R.string.incall_label_hold, - R.drawable.quantum_ic_pause_white_36); + R.drawable.quantum_ic_pause_vd_theme_24); } @Override @@ -474,7 +474,7 @@ interface ButtonController { InCallButtonIds.BUTTON_SWAP, R.string.incall_content_description_swap_calls, R.string.incall_label_swap, - R.drawable.quantum_ic_swap_calls_white_36); + R.drawable.quantum_ic_swap_calls_vd_theme_24); Assert.isNotNull(delegate); } @@ -492,7 +492,7 @@ interface ButtonController { InCallButtonIds.BUTTON_MERGE, R.string.incall_content_description_merge_calls, R.string.incall_label_merge, - R.drawable.quantum_ic_call_merge_white_36); + R.drawable.quantum_ic_call_merge_vd_theme_24); Assert.isNotNull(delegate); } @@ -510,7 +510,7 @@ interface ButtonController { InCallButtonIds.BUTTON_UPGRADE_TO_VIDEO, 0, R.string.incall_label_videocall, - R.drawable.quantum_ic_videocam_white_36); + R.drawable.quantum_ic_videocam_vd_theme_24); Assert.isNotNull(delegate); } @@ -530,7 +530,7 @@ interface ButtonController { InCallButtonIds.BUTTON_MANAGE_VOICE_CONFERENCE, R.string.a11y_description_incall_label_manage_content, R.string.incall_label_manage, - R.drawable.quantum_ic_group_white_36); + R.drawable.quantum_ic_group_vd_theme_24); Assert.isNotNull(inCallScreenDelegate); this.inCallScreenDelegate = inCallScreenDelegate; } @@ -551,7 +551,7 @@ interface ButtonController { InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY, R.string.incall_content_description_swap_calls, R.string.incall_label_swap, - R.drawable.quantum_ic_swap_calls_white_36); + R.drawable.quantum_ic_swap_calls_vd_theme_24); Assert.isNotNull(inCallScreenDelegate); this.inCallScreenDelegate = inCallScreenDelegate; } diff --git a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java index ca018acc2..03e6e3700 100644 --- a/java/com/android/incallui/incall/impl/CheckableLabeledButton.java +++ b/java/com/android/incallui/incall/impl/CheckableLabeledButton.java @@ -34,7 +34,6 @@ import android.view.Gravity; import android.view.SoundEffectConstants; import android.widget.Checkable; import android.widget.ImageView; -import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; import android.widget.TextView; @@ -82,13 +81,15 @@ public class CheckableLabeledButton extends LinearLayout implements Checkable { setPadding(paddingSize, paddingSize, paddingSize, paddingSize); int iconSize = getResources().getDimensionPixelSize(R.dimen.incall_labeled_button_size); + int imageSize = getResources().getDimensionPixelSize(R.dimen.incall_labeled_button_icon_size); + int iconPadding = (iconSize - imageSize) / 2; iconView = new ImageView(context, null, android.R.style.Widget_Material_Button_Colored); LayoutParams iconParams = generateDefaultLayoutParams(); iconParams.width = iconSize; iconParams.height = iconSize; iconView.setLayoutParams(iconParams); - iconView.setScaleType(ScaleType.CENTER_INSIDE); + iconView.setPadding(iconPadding, iconPadding, iconPadding, iconPadding); iconView.setImageDrawable(icon); iconView.setImageTintMode(Mode.SRC_IN); iconView.setImageTintList(getResources().getColorStateList(R.color.incall_button_icon, null)); diff --git a/java/com/android/incallui/incall/impl/res/values/dimens.xml b/java/com/android/incallui/incall/impl/res/values/dimens.xml index 076a7d7dd..439dc1d33 100644 --- a/java/com/android/incallui/incall/impl/res/values/dimens.xml +++ b/java/com/android/incallui/incall/impl/res/values/dimens.xml @@ -23,6 +23,7 @@ <dimen name="incall_button_vertical_padding">8dp</dimen> <dimen name="incall_avatar_size">0dp</dimen> <dimen name="incall_labeled_button_size">48dp</dimen> + <dimen name="incall_labeled_button_icon_size">36dp</dimen> <dimen name="tools_button_height">76dp</dimen> <dimen name="incall_window_margin_horizontal">24dp</dimen> |