From a40a9ef54ca0fe71756ad9d3e103d74ab0f58e19 Mon Sep 17 00:00:00 2001 From: twyen Date: Tue, 22 May 2018 17:35:59 -0700 Subject: Remove photo support in PhoneNumberService Also cleaned up unused parameters. TEST=TAP Bug: 78654933 Test: TAP PiperOrigin-RevId: 197652430 Change-Id: I1820e8c8de83fcda17f38e92d4ab1c28f519cdce --- java/com/android/incallui/CallCardPresenter.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'java/com/android/incallui/CallCardPresenter.java') diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 83c1aff5e..9772cb1df 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -321,9 +321,7 @@ public class CallCardPresenter } this.primary.addListener(this); - primaryContactInfo = - ContactInfoCache.buildCacheEntryFromCall( - context, this.primary, this.primary.getState() == DialerCallState.INCOMING); + primaryContactInfo = ContactInfoCache.buildCacheEntryFromCall(context, this.primary); updatePrimaryDisplayInfo(); maybeStartSearch(this.primary, true); } @@ -339,9 +337,7 @@ public class CallCardPresenter updateSecondaryDisplayInfo(); } else { // secondary call has changed - secondaryContactInfo = - ContactInfoCache.buildCacheEntryFromCall( - context, this.secondary, this.secondary.getState() == DialerCallState.INCOMING); + secondaryContactInfo = ContactInfoCache.buildCacheEntryFromCall(context, this.secondary); updateSecondaryDisplayInfo(); maybeStartSearch(this.secondary, false); } -- cgit v1.2.3 From f13f0b8bc727c3a9428c78fd193197b3232cf1e0 Mon Sep 17 00:00:00 2001 From: Android Dialer Date: Wed, 23 May 2018 14:05:34 -0700 Subject: Updating locations where PrimaryInfo#setPhoto is used to also PrimaryInfo#setPhotoUri for new GlidePhotoManager implementation. As part of this addition, we also are cleaning the setPhoto(null) because this is not explicitly needed. Bug: 76206920 Test: BottomRowTest,TopRowTest,SpeakEasyFragmentV2Test PiperOrigin-RevId: 197785533 Change-Id: I1702f43ec206a6c31cf162978712292aff0f8a17 --- java/com/android/incallui/CallCardPresenter.java | 1 + java/com/android/incallui/callpending/CallPendingActivity.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'java/com/android/incallui/CallCardPresenter.java') diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 9772cb1df..6614e7c74 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -722,6 +722,7 @@ public class CallCardPresenter : null) .setLabel(isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label) .setPhoto(primaryContactInfo.photo) + .setPhotoUri(primaryContactInfo.displayPhotoUri) .setPhotoType(primaryContactInfo.photoType) .setIsSipCall(primaryContactInfo.isSipCall) .setIsContactPhotoShown(showContactPhoto) diff --git a/java/com/android/incallui/callpending/CallPendingActivity.java b/java/com/android/incallui/callpending/CallPendingActivity.java index 3c69f97b5..a686308c2 100644 --- a/java/com/android/incallui/callpending/CallPendingActivity.java +++ b/java/com/android/incallui/callpending/CallPendingActivity.java @@ -166,9 +166,9 @@ public class CallPendingActivity extends FragmentActivity } Drawable photo = null; + Uri photoUri = getPhotoUri(); try { // TODO(calderwoodra) move to background thread - Uri photoUri = getPhotoUri(); InputStream is = getContentResolver().openInputStream(photoUri); photo = Drawable.createFromStream(is, photoUri.toString()); } catch (FileNotFoundException e) { @@ -185,6 +185,7 @@ public class CallPendingActivity extends FragmentActivity .setNameIsNumber(name != null && name.equals(number)) .setLabel(getPhoneLabel()) .setPhoto(photo) + .setPhotoUri(photoUri) .setPhotoType(ContactPhotoType.CONTACT) .setIsSipCall(false) .setIsContactPhotoShown(true) -- cgit v1.2.3