summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/app
diff options
context:
space:
mode:
authorroldenburg <roldenburg@google.com>2017-10-13 18:42:20 -0700
committerEric Erfanian <erfanian@google.com>2017-10-16 10:18:09 -0700
commit4f02639a38aa0fe522cfeb4c316d5bdffdeca7cd (patch)
treece3e26f0b407cea2707b4c4e598e5fcfa8a90375 /java/com/android/dialer/app
parent4114f539e72fa7b3be26949a2b33aa8ce25a68ea (diff)
Rename Lightbringer to Duo
Now that our Duo integration is public, we no longer need a code name. To avoid any disruption, logging and config related names were not changed. Bug: 63753964 Test: manual, existing tests PiperOrigin-RevId: 172172738 Change-Id: Ib9d3d80761944d850c8c4886def9fef9a28539a4
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r--java/com/android/dialer/app/calllog/CallLogAdapter.java33
-rw-r--r--java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java42
-rw-r--r--java/com/android/dialer/app/calllog/IntentProvider.java6
-rw-r--r--java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java8
4 files changed, 44 insertions, 45 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java
index 228321581..679901e9f 100644
--- a/java/com/android/dialer/app/calllog/CallLogAdapter.java
+++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java
@@ -73,12 +73,12 @@ import com.android.dialer.common.concurrent.AsyncTaskExecutor;
import com.android.dialer.common.concurrent.AsyncTaskExecutors;
import com.android.dialer.compat.android.provider.VoicemailCompat;
import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.duo.Duo;
+import com.android.dialer.duo.DuoComponent;
+import com.android.dialer.duo.DuoListener;
import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
import com.android.dialer.enrichedcall.EnrichedCallComponent;
import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.lightbringer.Lightbringer;
-import com.android.dialer.lightbringer.LightbringerComponent;
-import com.android.dialer.lightbringer.LightbringerListener;
import com.android.dialer.logging.ContactSource;
import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
@@ -96,7 +96,7 @@ import java.util.Set;
/** Adapter class to fill in data for the Call Log. */
public class CallLogAdapter extends GroupingListAdapter
- implements GroupCreator, OnVoicemailDeletedListener, LightbringerListener {
+ implements GroupCreator, OnVoicemailDeletedListener, DuoListener {
// Types of activities the call log adapter is used for
public static final int ACTIVITY_TYPE_CALL_LOG = 1;
@@ -382,13 +382,13 @@ public class CallLogAdapter extends GroupingListAdapter
}
expandViewHolderActions(viewHolder);
- if (isLightbringerCallButtonVisible(viewHolder.videoCallButtonView)) {
+ if (isDuoCallButtonVisible(viewHolder.videoCallButtonView)) {
CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();
}
}
}
- private boolean isLightbringerCallButtonVisible(View videoCallButtonView) {
+ private boolean isDuoCallButtonVisible(View videoCallButtonView) {
if (videoCallButtonView == null) {
return false;
}
@@ -399,8 +399,7 @@ public class CallLogAdapter extends GroupingListAdapter
if (intentProvider == null) {
return false;
}
- String packageName =
- LightbringerComponent.get(mActivity).getLightbringer().getPackageName();
+ String packageName = DuoComponent.get(mActivity).getDuo().getPackageName();
if (packageName == null) {
return false;
}
@@ -670,12 +669,12 @@ public class CallLogAdapter extends GroupingListAdapter
}
mContactsPreferences.refreshValue(ContactsPreferences.DISPLAY_ORDER_KEY);
mIsSpamEnabled = Spam.get(mActivity).isSpamEnabled();
- getLightbringer().registerListener(this);
+ getDuo().registerListener(this);
notifyDataSetChanged();
}
public void onPause() {
- getLightbringer().unregisterListener(this);
+ getDuo().unregisterListener(this);
pauseCache();
for (Uri uri : mHiddenItemUris) {
CallLogAsyncTaskUtil.deleteVoicemail(mActivity, uri, null);
@@ -846,7 +845,7 @@ public class CallLogAdapter extends GroupingListAdapter
// attempt to set the field properly in that case
views.isCallComposerCapable = isCallComposerCapable(views.number);
views.setDetailedPhoneDetails(callDetailsEntries);
- views.lightbringerReady = getLightbringer().isReachable(mActivity, views.number);
+ views.duoReady = getDuo().isReachable(mActivity, views.number);
final AsyncTask<Void, Void, Boolean> loadDataTask =
new AsyncTask<Void, Void, Boolean>() {
@Override
@@ -982,12 +981,12 @@ public class CallLogAdapter extends GroupingListAdapter
.setFeatures(cursor.getInt(CallLogQuery.FEATURES));
String phoneAccountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
- if (getLightbringer().getPhoneAccountComponentName() != null
- && getLightbringer()
+ if (getDuo().getPhoneAccountComponentName() != null
+ && getDuo()
.getPhoneAccountComponentName()
.flattenToString()
.equals(phoneAccountComponentName)) {
- entry.setIsLightbringerCall(true);
+ entry.setIsDuoCall(true);
}
entries.addEntries(entry.build());
@@ -1405,12 +1404,12 @@ public class CallLogAdapter extends GroupingListAdapter
}
@NonNull
- private Lightbringer getLightbringer() {
- return LightbringerComponent.get(mActivity).getLightbringer();
+ private Duo getDuo() {
+ return DuoComponent.get(mActivity).getDuo();
}
@Override
- public void onLightbringerStateChanged() {
+ public void onDuoStateChanged() {
notifyDataSetChanged();
}
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index ca846aebb..f0852bdb5 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -75,10 +75,10 @@ import com.android.dialer.constants.ActivityRequestCodes;
import com.android.dialer.contactphoto.ContactPhotoManager;
import com.android.dialer.dialercontact.DialerContact;
import com.android.dialer.dialercontact.SimDetails;
+import com.android.dialer.duo.Duo;
+import com.android.dialer.duo.DuoComponent;
import com.android.dialer.lettertile.LetterTileDrawable;
import com.android.dialer.lettertile.LetterTileDrawable.ContactType;
-import com.android.dialer.lightbringer.Lightbringer;
-import com.android.dialer.lightbringer.LightbringerComponent;
import com.android.dialer.logging.ContactSource;
import com.android.dialer.logging.ContactSource.Type;
import com.android.dialer.logging.DialerImpression;
@@ -222,7 +222,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
public boolean isSpam;
public boolean isCallComposerCapable;
- public boolean lightbringerReady;
+ public boolean duoReady;
private View.OnClickListener mExpandCollapseListener;
private final OnActionModeStateChangedListener onActionModeStateChangedListener;
@@ -533,10 +533,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
primaryActionButtonView.setImageResource(R.drawable.quantum_ic_videocam_vd_theme_24);
primaryActionButtonView.setVisibility(View.VISIBLE);
break;
- case CallbackAction.LIGHTBRINGER:
- if (showLightbringerPrimaryButton()) {
+ case CallbackAction.DUO:
+ if (showDuoPrimaryButton()) {
CallIntentBuilder.increaseLightbringerCallButtonAppearInCollapsedCallLogItemCount();
- primaryActionButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number));
+ primaryActionButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number));
} else {
primaryActionButtonView.setTag(
IntentProvider.getReturnVideoCallIntentProvider(number, accountHandle));
@@ -644,21 +644,21 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
switch (callbackAction) {
case CallbackAction.IMS_VIDEO:
- case CallbackAction.LIGHTBRINGER:
- // For an IMS video call or a Lightbringer call, the secondary action should always be a
+ case CallbackAction.DUO:
+ // For an IMS video call or a Duo call, the secondary action should always be a
// voice callback.
callButtonView.setVisibility(View.VISIBLE);
videoCallButtonView.setVisibility(View.GONE);
break;
case CallbackAction.VOICE:
// For a voice call, set the secondary callback action to be an IMS video call if it is
- // available. Otherwise try to set it as a Lightbringer call.
+ // available. Otherwise try to set it as a Duo call.
if (CallUtil.isVideoEnabled(mContext)
&& (hasPlacedCarrierVideoCall() || canSupportCarrierVideoCall())) {
videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number));
videoCallButtonView.setVisibility(View.VISIBLE);
- } else if (lightbringerReady) {
- videoCallButtonView.setTag(IntentProvider.getLightbringerIntentProvider(number));
+ } else if (duoReady) {
+ videoCallButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number));
videoCallButtonView.setVisibility(View.VISIBLE);
}
break;
@@ -744,10 +744,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
return false;
}
- private boolean showLightbringerPrimaryButton() {
+ private boolean showDuoPrimaryButton() {
return accountHandle != null
- && accountHandle.getComponentName().equals(getLightbringer().getPhoneAccountComponentName())
- && lightbringerReady;
+ && accountHandle.getComponentName().equals(getDuo().getPhoneAccountComponentName())
+ && duoReady;
}
private static boolean hasDialableChar(CharSequence number) {
@@ -958,10 +958,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
return;
}
- // We check to see if we are starting a Lightbringer intent. The reason is Lightbringer
+ // We check to see if we are starting a Duo intent. The reason is Duo
// intents need to be started using startActivityForResult instead of the usual startActivity
String packageName = intent.getPackage();
- if (packageName != null && packageName.equals(getLightbringer().getPackageName())) {
+ if (packageName != null && packageName.equals(getDuo().getPackageName())) {
Logger.get(mContext)
.logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG);
if (isNonContactEntry(info)) {
@@ -969,7 +969,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
.logImpression(
DialerImpression.Type.LIGHTBRINGER_NON_CONTACT_VIDEO_REQUESTED_FROM_CALL_LOG);
}
- startLightbringerActivity(intent);
+ startDuoActivity(intent);
} else if (CallDetailsActivity.isLaunchIntent(intent)) {
PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL);
((Activity) mContext)
@@ -993,10 +993,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
return false;
}
- private void startLightbringerActivity(Intent intent) {
+ private void startDuoActivity(Intent intent) {
try {
Activity activity = (Activity) mContext;
- activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_LIGHTBRINGER);
+ activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);
} catch (ActivityNotFoundException e) {
Toast.makeText(mContext, R.string.activity_not_available, Toast.LENGTH_SHORT).show();
}
@@ -1126,8 +1126,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
}
@NonNull
- private Lightbringer getLightbringer() {
- return LightbringerComponent.get(mContext).getLightbringer();
+ private Duo getDuo() {
+ return DuoComponent.get(mContext).getDuo();
}
@Override
diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java
index 5030de5f5..c812bf83b 100644
--- a/java/com/android/dialer/app/calllog/IntentProvider.java
+++ b/java/com/android/dialer/app/calllog/IntentProvider.java
@@ -31,7 +31,7 @@ import com.android.dialer.calldetails.CallDetailsEntries;
import com.android.dialer.callintent.CallInitiationType;
import com.android.dialer.callintent.CallIntentBuilder;
import com.android.dialer.dialercontact.DialerContact;
-import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.duo.DuoComponent;
import com.android.dialer.util.CallUtil;
import com.android.dialer.util.IntentUtil;
import java.util.ArrayList;
@@ -91,11 +91,11 @@ public abstract class IntentProvider {
};
}
- public static IntentProvider getLightbringerIntentProvider(String number) {
+ public static IntentProvider getDuoVideoIntentProvider(String number) {
return new IntentProvider() {
@Override
public Intent getIntent(Context context) {
- return LightbringerComponent.get(context).getLightbringer().getIntent(context, number);
+ return DuoComponent.get(context).getDuo().getIntent(context, number);
}
};
}
diff --git a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
index cd5712eed..cd5843c85 100644
--- a/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
+++ b/java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java
@@ -41,8 +41,8 @@ import com.android.contacts.common.preference.ContactsPreferences;
import com.android.dialer.app.R;
import com.android.dialer.common.LogUtil;
import com.android.dialer.contactphoto.ContactPhotoManager;
-import com.android.dialer.lightbringer.Lightbringer;
-import com.android.dialer.lightbringer.LightbringerComponent;
+import com.android.dialer.duo.Duo;
+import com.android.dialer.duo.DuoComponent;
import com.android.dialer.logging.InteractionEvent;
import com.android.dialer.logging.Logger;
import com.android.dialer.shortcuts.ShortcutRefresher;
@@ -303,11 +303,11 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements OnDragDrop
ShortcutRefresher.refresh(mContext, mContactEntries);
notifyDataSetChanged();
- Lightbringer lightbringer = LightbringerComponent.get(mContext).getLightbringer();
+ Duo duo = DuoComponent.get(mContext).getDuo();
for (ContactEntry contact : mContactEntries) {
if (contact.phoneNumber == null) {
multipleNumbersContactsCount++;
- } else if (lightbringer.isReachable(mContext, contact.phoneNumber)) {
+ } else if (duo.isReachable(mContext, contact.phoneNumber)) {
lightbringerReachableContactsCount++;
}
}