summaryrefslogtreecommitdiff
path: root/java/com/android/contacts/common
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/contacts/common
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/contacts/common')
-rw-r--r--java/com/android/contacts/common/list/ContactListItemView.java8
-rw-r--r--java/com/android/contacts/common/list/PhoneNumberListAdapter.java8
-rw-r--r--java/com/android/contacts/common/list/PhoneNumberPickerFragment.java9
3 files changed, 11 insertions, 14 deletions
diff --git a/java/com/android/contacts/common/list/ContactListItemView.java b/java/com/android/contacts/common/list/ContactListItemView.java
index c605f4e87..0a5bf094b 100644
--- a/java/com/android/contacts/common/list/ContactListItemView.java
+++ b/java/com/android/contacts/common/list/ContactListItemView.java
@@ -81,12 +81,12 @@ public class ContactListItemView extends ViewGroup implements SelectionBoundsAdj
/** IntDef for indices of ViewPager tabs. */
@Retention(RetentionPolicy.SOURCE)
- @IntDef({NONE, VIDEO, LIGHTBRINGER, CALL_AND_SHARE})
+ @IntDef({NONE, VIDEO, DUO, CALL_AND_SHARE})
public @interface CallToAction {}
public static final int NONE = 0;
public static final int VIDEO = 1;
- public static final int LIGHTBRINGER = 2;
+ public static final int DUO = 2;
public static final int CALL_AND_SHARE = 3;
private final PhotoPosition mPhotoPosition = getDefaultPhotoPosition();
@@ -341,13 +341,13 @@ public class ContactListItemView extends ViewGroup implements SelectionBoundsAdj
drawable.setAutoMirrored(true);
description = R.string.description_search_video_call;
onClickListener = v -> listener.onVideoCallIconClicked(position);
- } else if (action == LIGHTBRINGER) {
+ } else if (action == DUO) {
CallIntentBuilder.increaseLightbringerCallButtonAppearInSearchCount();
drawable =
ContextCompat.getDrawable(getContext(), R.drawable.quantum_ic_videocam_vd_theme_24);
drawable.setAutoMirrored(true);
description = R.string.description_search_video_call;
- onClickListener = v -> listener.onLightbringerIconClicked(position);
+ onClickListener = v -> listener.onDuoVideoIconClicked(position);
} else {
mCallToActionView.setVisibility(View.GONE);
mCallToActionView.setOnClickListener(null);
diff --git a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 8cf54b96c..58628d2a3 100644
--- a/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/java/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -45,11 +45,11 @@ import com.android.dialer.compat.CompatUtils;
import com.android.dialer.configprovider.ConfigProviderBindings;
import com.android.dialer.contactphoto.ContactPhotoManager.DefaultImageRequest;
import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.duo.DuoComponent;
import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
import com.android.dialer.enrichedcall.EnrichedCallComponent;
import com.android.dialer.enrichedcall.EnrichedCallManager;
import com.android.dialer.lettertile.LetterTileDrawable;
-import com.android.dialer.lightbringer.LightbringerComponent;
import com.android.dialer.phonenumberutil.PhoneNumberHelper;
import com.android.dialer.util.CallUtil;
import java.util.ArrayList;
@@ -405,8 +405,8 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
}
if (action == ContactListItemView.NONE
- && LightbringerComponent.get(mContext).getLightbringer().isReachable(mContext, number)) {
- action = ContactListItemView.LIGHTBRINGER;
+ && DuoComponent.get(mContext).getDuo().isReachable(mContext, number)) {
+ action = ContactListItemView.DUO;
}
if (action == ContactListItemView.NONE) {
@@ -576,7 +576,7 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter {
void onVideoCallIconClicked(int position);
- void onLightbringerIconClicked(int position);
+ void onDuoVideoIconClicked(int position);
void onCallAndShareIconClicked(int position);
}
diff --git a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
index d704e5492..1a3b80f31 100644
--- a/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
+++ b/java/com/android/contacts/common/list/PhoneNumberPickerFragment.java
@@ -37,9 +37,9 @@ import com.android.dialer.callintent.CallSpecificAppData;
import com.android.dialer.common.Assert;
import com.android.dialer.common.LogUtil;
import com.android.dialer.dialercontact.DialerContact;
+import com.android.dialer.duo.DuoComponent;
import com.android.dialer.enrichedcall.EnrichedCallComponent;
import com.android.dialer.enrichedcall.EnrichedCallManager;
-import com.android.dialer.lightbringer.LightbringerComponent;
import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
import com.android.dialer.performancereport.PerformanceReport;
@@ -91,13 +91,10 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactE
}
@Override
- public void onLightbringerIconClicked(int position) {
+ public void onDuoVideoIconClicked(int position) {
PerformanceReport.stopRecording();
String phoneNumber = getPhoneNumber(position);
- Intent intent =
- LightbringerComponent.get(getContext())
- .getLightbringer()
- .getIntent(getContext(), phoneNumber);
+ Intent intent = DuoComponent.get(getContext()).getDuo().getIntent(getContext(), phoneNumber);
// DialtactsActivity.ACTIVITY_REQUEST_CODE_LIGHTBRINGER
// Cannot reference because of cyclic dependencies
Logger.get(getContext())