commit 83b20211c3be04a850de3674977deee8e448d17f
author Eric Erfanian <erfanian@google.com> Wed May 31 08:53:10 2017 -0700
committer Eric Erfanian <erfanian@google.com> Wed May 31 08:53:10 2017 -0700
tree a596b78feffa5d267b227762a2917da2e3eaf9c1
parent d40e05b9e0d8331a01af64e37730d177b9b948d5

Update Dialer to v10 RC45.

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC45
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC45

This release contains the following bug fixes since RC39:
Bug: 38131932 38302993 38347350 38368993 38395481
62100344

Test: make, on device
Change-Id: Ib4af5dcc58c684d51ea1f4628b301e40184b81b3

java/com/android/incallui/StatusBarNotifier.java

diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index af541b0..165b30b 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -33,8 +33,8 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
@@ -302,7 +302,7 @@
 
     // Check if data has changed; if nothing is different, don't issue another notification.
     final int iconResId = getIconToDisplay(call);
-    Bitmap largeIcon = getLargeIconToDisplay(contactInfo, call);
+    Bitmap largeIcon = getLargeIconToDisplay(mContext, contactInfo, call);
     final String content = getContentString(call, contactInfo.userType);
     final String contentTitle = getContentTitle(contactInfo, call);
 
@@ -594,30 +594,29 @@
   }
 
   /** Gets a large icon from the contact info object to display in the notification. */
-  private Bitmap getLargeIconToDisplay(ContactCacheEntry contactInfo, DialerCall call) {
+  private static Bitmap getLargeIconToDisplay(
+      Context context, ContactCacheEntry contactInfo, DialerCall call) {
+    Resources resources = context.getResources();
     Bitmap largeIcon = null;
-    if (call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) {
-      largeIcon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.img_conference);
-    }
     if (contactInfo.photo != null && (contactInfo.photo instanceof BitmapDrawable)) {
       largeIcon = ((BitmapDrawable) contactInfo.photo).getBitmap();
     }
     if (contactInfo.photo == null) {
-      int width =
-          (int) mContext.getResources().getDimension(android.R.dimen.notification_large_icon_width);
-      int height =
-          (int)
-              mContext.getResources().getDimension(android.R.dimen.notification_large_icon_height);
+      int width = (int) resources.getDimension(android.R.dimen.notification_large_icon_width);
+      int height = (int) resources.getDimension(android.R.dimen.notification_large_icon_height);
       int contactType = LetterTileDrawable.TYPE_DEFAULT;
-      LetterTileDrawable lettertile = new LetterTileDrawable(mContext.getResources());
+      LetterTileDrawable lettertile = new LetterTileDrawable(resources);
 
       // TODO: Deduplicate across Dialer. b/36195917
-      if (CallerInfoUtils.isVoiceMailNumber(mContext, call)) {
+      if (CallerInfoUtils.isVoiceMailNumber(context, call)) {
         contactType = LetterTileDrawable.TYPE_VOICEMAIL;
       } else if (contactInfo.isBusiness) {
         contactType = LetterTileDrawable.TYPE_BUSINESS;
       } else if (call.getNumberPresentation() == TelecomManager.PRESENTATION_RESTRICTED) {
         contactType = LetterTileDrawable.TYPE_GENERIC_AVATAR;
+      } else if (call.isConferenceCall()
+          && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) {
+        contactType = LetterTileDrawable.TYPE_CONFERENCE;
       }
       lettertile.setCanonicalDialerLetterTileDetails(
           contactInfo.namePrimary == null ? contactInfo.number : contactInfo.namePrimary,
@@ -628,8 +627,7 @@
     }
 
     if (call.isSpam()) {
-      Drawable drawable =
-          mContext.getResources().getDrawable(R.drawable.blocked_contact, mContext.getTheme());
+      Drawable drawable = resources.getDrawable(R.drawable.blocked_contact, context.getTheme());
       largeIcon = DrawableConverter.drawableToBitmap(drawable);
     }
     return largeIcon;