diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-31 18:07:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-31 18:07:17 +0000 |
commit | ae06b1b3b86fcaffde9f94171bbb2b5649a95f14 (patch) | |
tree | 1f6349a450779c93e514fec9948d64e50d9b4e1e /java/com/android/contacts | |
parent | 7f7f25f903e4649f12aaa255b32bd20cb4079183 (diff) | |
parent | 83b20211c3be04a850de3674977deee8e448d17f (diff) |
Update Dialer to v10 RC45.
am: 83b20211c3
Change-Id: Ide21415247a3ec743f5438c49d29ba2d861081b0
Diffstat (limited to 'java/com/android/contacts')
-rw-r--r-- | java/com/android/contacts/common/lettertiles/LetterTileDrawable.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java b/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java index f8ea140b3..88522c44b 100644 --- a/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java +++ b/java/com/android/contacts/common/lettertiles/LetterTileDrawable.java @@ -61,6 +61,7 @@ public class LetterTileDrawable extends Drawable { */ public static final int TYPE_GENERIC_AVATAR = 4; public static final int TYPE_SPAM = 5; + public static final int TYPE_CONFERENCE = 6; @ContactType public static final int TYPE_DEFAULT = TYPE_PERSON; /** @@ -99,6 +100,8 @@ public class LetterTileDrawable extends Drawable { private static Drawable sDefaultBusinessAvatar; private static Drawable sDefaultVoicemailAvatar; private static Drawable sDefaultSpamAvatar; + private static Drawable sDefaultConferenceAvatar; + private final Paint mPaint; @ContactType private int mContactType = TYPE_DEFAULT; private float mScale = 1.0f; @@ -122,6 +125,7 @@ public class LetterTileDrawable extends Drawable { sDefaultBusinessAvatar = res.getDrawable(R.drawable.quantum_ic_business_vd_theme_24, null); sDefaultVoicemailAvatar = res.getDrawable(R.drawable.quantum_ic_voicemail_vd_theme_24, null); sDefaultSpamAvatar = res.getDrawable(R.drawable.quantum_ic_report_vd_theme_24, null); + sDefaultConferenceAvatar = res.getDrawable(R.drawable.quantum_ic_group_vd_theme_24, null); sPaint.setTypeface( Typeface.create(res.getString(R.string.letter_tile_letter_font_family), Typeface.NORMAL)); sPaint.setTextAlign(Align.CENTER); @@ -159,6 +163,9 @@ public class LetterTileDrawable extends Drawable { case TYPE_SPAM: mScale = VECTOR_ICON_SCALE; return sDefaultSpamAvatar; + case TYPE_CONFERENCE: + mScale = VECTOR_ICON_SCALE; + return sDefaultConferenceAvatar; case TYPE_PERSON: case TYPE_GENERIC_AVATAR: default: |