Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.
Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.
Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
diff --git a/java/com/android/incallui/StatusBarNotifier.java b/java/com/android/incallui/StatusBarNotifier.java
index 229f08c..165b30b 100644
--- a/java/com/android/incallui/StatusBarNotifier.java
+++ b/java/com/android/incallui/StatusBarNotifier.java
@@ -62,11 +62,11 @@
import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.ContactsUtils.UserType;
import com.android.contacts.common.lettertiles.LetterTileDrawable;
-import com.android.contacts.common.lettertiles.LetterTileDrawable.ContactType;
import com.android.contacts.common.preference.ContactsPreferences;
import com.android.contacts.common.util.BitmapUtil;
import com.android.contacts.common.util.ContactDisplayUtils;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.enrichedcall.EnrichedCallComponent;
import com.android.dialer.enrichedcall.EnrichedCallManager;
import com.android.dialer.enrichedcall.Session;
import com.android.dialer.multimedia.MultimediaData;
@@ -565,9 +565,8 @@
@VisibleForTesting
@Nullable
String getContentTitle(ContactCacheEntry contactInfo, DialerCall call) {
- if (call.isConferenceCall()) {
- return CallerInfoUtils.getConferenceString(
- mContext, call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE));
+ if (call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) {
+ return mContext.getResources().getString(R.string.conference_call_name);
}
String preferredName =
@@ -605,16 +604,20 @@
if (contactInfo.photo == null) {
int width = (int) resources.getDimension(android.R.dimen.notification_large_icon_width);
int height = (int) resources.getDimension(android.R.dimen.notification_large_icon_height);
- @ContactType
- int contactType =
- LetterTileDrawable.getContactTypeFromPrimitives(
- CallerInfoUtils.isVoiceMailNumber(context, call),
- call.isSpam(),
- contactInfo.isBusiness,
- call.getNumberPresentation(),
- call.isConferenceCall() && !call.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE));
+ int contactType = LetterTileDrawable.TYPE_DEFAULT;
LetterTileDrawable lettertile = new LetterTileDrawable(resources);
+ // TODO: Deduplicate across Dialer. b/36195917
+ 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,
contactInfo.lookupKey,
@@ -691,10 +694,20 @@
}
if (isIncomingOrWaiting) {
+ EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager();
+ Session session = null;
+ if (call.getNumber() != null) {
+ session =
+ manager.getSession(
+ call.getUniqueCallId(),
+ call.getNumber(),
+ manager.createIncomingCallComposerFilter());
+ }
+
if (call.isSpam()) {
resId = R.string.notification_incoming_spam_call;
- } else if (shouldShowEnrichedCallNotification(call.getEnrichedCallSession())) {
- resId = getECIncomingCallText(call.getEnrichedCallSession());
+ } else if (session != null) {
+ resId = getECIncomingCallText(session);
} else if (call.hasProperty(Details.PROPERTY_WIFI)) {
resId = R.string.notification_incoming_call_wifi;
} else {
@@ -718,13 +731,6 @@
return mContext.getString(resId);
}
- private boolean shouldShowEnrichedCallNotification(Session session) {
- if (session == null) {
- return false;
- }
- return session.getMultimediaData().hasData() || session.getMultimediaData().isImportant();
- }
-
private int getECIncomingCallText(Session session) {
int resId;
MultimediaData data = session.getMultimediaData();
@@ -750,10 +756,8 @@
} else {
resId = R.string.important_notification_incoming_call_with_photo;
}
- } else if (hasSubject) {
- resId = R.string.important_notification_incoming_call_with_message;
} else {
- resId = R.string.important_notification_incoming_call;
+ resId = R.string.important_notification_incoming_call_with_message;
}
if (mContext.getString(resId).length() > 50) {
resId = R.string.important_notification_incoming_call_attachments;
@@ -1001,9 +1005,6 @@
@Override
public void onInternationalCallOnWifi() {}
- @Override
- public void onEnrichedCallSessionUpdate() {}
-
/**
* Responds to changes in the session modification state for the call by dismissing the status
* bar notification as required.