diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-31 08:53:10 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-05-31 08:53:10 -0700 |
| commit | 83b20211c3be04a850de3674977deee8e448d17f (patch) | |
| tree | a596b78feffa5d267b227762a2917da2e3eaf9c1 /java/com/android/incallui/CallCardPresenter.java | |
| parent | d40e05b9e0d8331a01af64e37730d177b9b948d5 (diff) | |
| download | android_packages_apps_Dialer-83b20211c3be04a850de3674977deee8e448d17f.tar.gz android_packages_apps_Dialer-83b20211c3be04a850de3674977deee8e448d17f.tar.bz2 android_packages_apps_Dialer-83b20211c3be04a850de3674977deee8e448d17f.zip | |
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
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; |