diff options
author | roldenburg <roldenburg@google.com> | 2017-10-13 18:42:20 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-10-16 10:18:09 -0700 |
commit | 4f02639a38aa0fe522cfeb4c316d5bdffdeca7cd (patch) | |
tree | ce3e26f0b407cea2707b4c4e598e5fcfa8a90375 /java/com/android/dialer/calldetails | |
parent | 4114f539e72fa7b3be26949a2b33aa8ce25a68ea (diff) | |
download | android_packages_apps_Dialer-4f02639a38aa0fe522cfeb4c316d5bdffdeca7cd.tar.gz android_packages_apps_Dialer-4f02639a38aa0fe522cfeb4c316d5bdffdeca7cd.tar.bz2 android_packages_apps_Dialer-4f02639a38aa0fe522cfeb4c316d5bdffdeca7cd.zip |
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/calldetails')
5 files changed, 17 insertions, 20 deletions
diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index d871fce12..3a3c9118a 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -42,11 +42,11 @@ import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.AsyncTaskExecutors; import com.android.dialer.constants.ActivityRequestCodes; import com.android.dialer.dialercontact.DialerContact; +import com.android.dialer.duo.Duo; +import com.android.dialer.duo.DuoComponent; import com.android.dialer.enrichedcall.EnrichedCallComponent; import com.android.dialer.enrichedcall.EnrichedCallManager.HistoricalDataChangedListener; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; -import com.android.dialer.lightbringer.Lightbringer; -import com.android.dialer.lightbringer.LightbringerComponent; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.logging.UiAction; @@ -219,17 +219,16 @@ public class CallDetailsActivity extends AppCompatActivity } @Override - public void placeLightbringerCall(String phoneNumber) { + public void placeDuoVideoCall(String phoneNumber) { Logger.get(this).logImpression(DialerImpression.Type.CALL_DETAILS_LIGHTBRINGER_CALL_BACK); - Lightbringer lightbringer = LightbringerComponent.get(this).getLightbringer(); - if (!lightbringer.isReachable(this, phoneNumber)) { + Duo duo = DuoComponent.get(this).getDuo(); + if (!duo.isReachable(this, phoneNumber)) { placeImsVideoCall(phoneNumber); return; } try { - startActivityForResult( - lightbringer.getIntent(this, phoneNumber), ActivityRequestCodes.DIALTACTS_LIGHTBRINGER); + startActivityForResult(duo.getIntent(this, phoneNumber), ActivityRequestCodes.DIALTACTS_DUO); } catch (ActivityNotFoundException e) { Toast.makeText(this, R.string.activity_not_available, Toast.LENGTH_SHORT).show(); } diff --git a/java/com/android/dialer/calldetails/CallDetailsAdapter.java b/java/com/android/dialer/calldetails/CallDetailsAdapter.java index 1f00d9d9a..b39fa0fb3 100644 --- a/java/com/android/dialer/calldetails/CallDetailsAdapter.java +++ b/java/com/android/dialer/calldetails/CallDetailsAdapter.java @@ -29,7 +29,7 @@ import com.android.dialer.calllogutils.CallbackActionHelper; import com.android.dialer.calllogutils.CallbackActionHelper.CallbackAction; import com.android.dialer.common.Assert; import com.android.dialer.dialercontact.DialerContact; -import com.android.dialer.lightbringer.LightbringerComponent; +import com.android.dialer.duo.DuoComponent; import java.util.List; /** Adapter for RecyclerView in {@link CallDetailsActivity}. */ @@ -55,9 +55,7 @@ final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol this.callDetailsEntries = callDetailsEntries; this.callbackActionListener = callbackActionListener; this.reportCallIdListener = reportCallIdListener; - callTypeHelper = - new CallTypeHelper( - context.getResources(), LightbringerComponent.get(context).getLightbringer()); + callTypeHelper = new CallTypeHelper(context.getResources(), DuoComponent.get(context).getDuo()); } @Override @@ -122,6 +120,6 @@ final class CallDetailsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol CallDetailsEntry entry = callDetailsEntries.get(0); return CallbackActionHelper.getCallbackAction( - contact.getNumber(), entry.getFeatures(), entry.getIsLightbringerCall()); + contact.getNumber(), entry.getFeatures(), entry.getIsDuoCall()); } } diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java index 4e7b8c612..a713c55a4 100644 --- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java @@ -92,7 +92,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { boolean isPulledCall = (entry.getFeatures() & Calls.FEATURES_PULLED_EXTERNALLY) == Calls.FEATURES_PULLED_EXTERNALLY; - boolean isLightbringerCall = entry.getIsLightbringerCall(); + boolean isDuoCall = entry.getIsDuoCall(); callTime.setTextColor(getColorForCallType(context, callType)); callTypeIcon.clear(); @@ -103,7 +103,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { MotorolaUtils.shouldShowWifiIconInCallLog(context, entry.getFeatures())); callTypeText.setText( - callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall, isLightbringerCall)); + callTypeHelper.getCallTypeText(callType, isVideoCall, isPulledCall, isDuoCall)); callTime.setText(CallLogDates.formatDate(context, entry.getDate())); if (CallTypeHelper.isMissedCallType(callType)) { diff --git a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java index 7c3892a33..1e08963ed 100644 --- a/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsHeaderViewHolder.java @@ -106,7 +106,7 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder private void setCallbackAction(@CallbackAction int callbackAction) { this.callbackAction = callbackAction; switch (callbackAction) { - case CallbackAction.LIGHTBRINGER: + case CallbackAction.DUO: case CallbackAction.IMS_VIDEO: callbackButton.setVisibility(View.VISIBLE); callbackButton.setImageResource(R.drawable.quantum_ic_videocam_vd_theme_24); @@ -130,8 +130,8 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder case CallbackAction.IMS_VIDEO: callbackActionListener.placeImsVideoCall(contact.getNumber()); break; - case CallbackAction.LIGHTBRINGER: - callbackActionListener.placeLightbringerCall(contact.getNumber()); + case CallbackAction.DUO: + callbackActionListener.placeDuoVideoCall(contact.getNumber()); break; case CallbackAction.VOICE: callbackActionListener.placeVoiceCall(contact.getNumber(), contact.getPostDialDigits()); @@ -151,8 +151,8 @@ public class CallDetailsHeaderViewHolder extends RecyclerView.ViewHolder /** Places an IMS video call. */ void placeImsVideoCall(String phoneNumber); - /** Places a Lightbringer call. */ - void placeLightbringerCall(String phoneNumber); + /** Places a Duo video call. */ + void placeDuoVideoCall(String phoneNumber); /** Place a traditional voice call. */ void placeVoiceCall(String phoneNumber, String postDialDigits); diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto index 587fd35bd..7a5700b1c 100644 --- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto +++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto @@ -18,7 +18,7 @@ message CallDetailsEntries { optional int64 duration = 5; optional int64 data_usage = 6; repeated enrichedcall.historyquery.proto.HistoryResult history_results = 7; - optional bool is_lightbringer_call = 8; + optional bool is_duo_call = 8; } repeated CallDetailsEntry entries = 1; |