diff options
Diffstat (limited to 'java/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 0b3592d01..c2b99c1d1 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -465,7 +465,8 @@ public class CallCardPresenter shouldShowCallSubject(mPrimary) ? mPrimary.getCallSubject() : null, mPrimary.getCallbackNumber(), mPrimary.hasProperty(Details.PROPERTY_WIFI), - mPrimary.isConferenceCall(), + mPrimary.isConferenceCall() + && !mPrimary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE), isWorkCall, isAttemptingHdAudioCall, isHdAudioCall, @@ -699,7 +700,7 @@ public class CallCardPresenter false /* nameIsNumber */, null /* location */, null /* label */, - getConferencePhoto(mPrimary), + null /* photo */, ContactPhotoType.DEFAULT_PLACEHOLDER, false /* isSipCall */, showContactPhoto, @@ -1043,16 +1044,6 @@ public class CallCardPresenter return mContext.getResources().getString(resId); } - private Drawable getConferencePhoto(DialerCall call) { - boolean isGenericConference = call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE); - LogUtil.v("CallCardPresenter.getConferencePhoto", "" + isGenericConference); - - final int resId = isGenericConference ? R.drawable.img_phone : R.drawable.img_conference; - Drawable photo = mContext.getResources().getDrawable(resId); - photo.setAutoMirrored(true); - return photo; - } - private boolean shouldShowEndCallButton(DialerCall primary, int callState) { if (primary == null) { return false; |