diff options
| author | linyuh <linyuh@google.com> | 2018-03-28 13:09:47 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-28 13:51:52 -0700 |
| commit | 8dc242deac3ef9f96f0ab7de0048477dd64b6a32 (patch) | |
| tree | bf7a52f0e451dd1dde272d47f4baf4bd6043a1d3 /java/com/android/dialer/calllogutils | |
| parent | c9e06d9dd4c210bf7ed7cc3cf81d1acaa8d6089f (diff) | |
Replace assets "quantum_ic_videocam_white_24" with a vector asset.
Test: Existing tests
PiperOrigin-RevId: 190820867
Change-Id: I4835bcbc7698075fb54015dccc6823ada4c71651
Diffstat (limited to 'java/com/android/dialer/calllogutils')
| -rw-r--r-- | java/com/android/dialer/calllogutils/CallTypeIconsView.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/java/com/android/dialer/calllogutils/CallTypeIconsView.java b/java/com/android/dialer/calllogutils/CallTypeIconsView.java index 3d2b561f1..1795438fb 100644 --- a/java/com/android/dialer/calllogutils/CallTypeIconsView.java +++ b/java/com/android/dialer/calllogutils/CallTypeIconsView.java @@ -19,7 +19,6 @@ package com.android.dialer.calllogutils; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.PorterDuff; import android.graphics.drawable.BitmapDrawable; @@ -297,7 +296,7 @@ public class CallTypeIconsView extends View { blocked = drawable.mutate(); blocked.setColorFilter(r.getColor(R.color.blocked_call), PorterDuff.Mode.MULTIPLY); - iconId = R.drawable.quantum_ic_videocam_white_24; + iconId = R.drawable.quantum_ic_videocam_vd_white_24; drawable = largeIcons ? r.getDrawable(iconId) : getScaledBitmap(context, iconId); videoCall = drawable.mutate(); videoCall.setColorFilter(r.getColor(R.color.icon_color_grey), PorterDuff.Mode.MULTIPLY); @@ -324,7 +323,14 @@ public class CallTypeIconsView extends View { // Gets the icon, scaled to the height of the call type icons. This helps display all the // icons to be the same height, while preserving their width aspect ratio. private Drawable getScaledBitmap(Context context, int resourceId) { - Bitmap icon = BitmapFactory.decodeResource(context.getResources(), resourceId); + Drawable drawable = context.getDrawable(resourceId); + Bitmap icon = + Bitmap.createBitmap( + drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(icon); + drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + drawable.draw(canvas); + int scaledHeight = context.getResources().getDimensionPixelSize(R.dimen.call_type_icon_size); int scaledWidth = (int) ((float) icon.getWidth() * ((float) scaledHeight / (float) icon.getHeight())); |