diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-26 23:32:10 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-26 23:32:10 +0000 |
commit | f068a1d55daa763325bd446892dd836557a4715e (patch) | |
tree | 1063c4399d6cecb8e0f6e2abc02422bf54ffa4d3 /java/com/android/incallui/CallCardPresenter.java | |
parent | b2c8e1c635c5c1803ef712e29f46a0ebf172cf27 (diff) | |
parent | 2e2a171000ec3c468009c739e8cc540f021f4ad7 (diff) |
Merge changes I1c9fd942,Ib1b4baee
* changes:
Added Call History activity to MainMenu.
Updating PrimaryCallState value class to use AutoValue with builder pattern.
Diffstat (limited to 'java/com/android/incallui/CallCardPresenter.java')
-rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index b945b0810..ad92f57c9 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -352,7 +352,7 @@ public class CallCardPresenter callState = this.primary.getState(); updatePrimaryCallState(); } else { - getUi().setCallState(PrimaryCallState.createEmptyPrimaryCallState()); + getUi().setCallState(PrimaryCallState.empty()); } maybeShowManageConferenceCallButton(); @@ -472,34 +472,39 @@ public class CallCardPresenter !VideoCallPresenter.showIncomingVideo(primary.getVideoState(), primary.getState()); getUi() .setCallState( - new PrimaryCallState( - primary.getState(), - primary.isVideoCall(), - primary.getVideoTech().getSessionModificationState(), - primary.getDisconnectCause(), - getConnectionLabel(), - getCallStateIcon(), - getGatewayNumber(), - shouldShowCallSubject(primary) ? primary.getCallSubject() : null, - PhoneNumberHelper.formatNumber( - primary.getCallbackNumber(), primary.getSimCountryIso()), - primary.hasProperty(Details.PROPERTY_WIFI), - primary.isConferenceCall() - && !primary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE), - isWorkCall, - isAttemptingHdAudioCall, - isHdAudioCall, - !TextUtils.isEmpty(primary.getLastForwardedNumber()) || primary.isCallForwarded(), - shouldShowContactPhoto, - primary.getConnectTimeMillis(), - primary.isVoiceMailNumber(), - primary.isRemotelyHeld(), - isBusiness, - supports2ndCallOnHold(), - getSwapToSecondaryButtonState(), - primary.isAssistedDialed(), - null, - primary.getAssistedDialingExtras())); + PrimaryCallState.builder() + .setState(primary.getState()) + .setIsVideoCall(primary.isVideoCall()) + .setSessionModificationState(primary.getVideoTech().getSessionModificationState()) + .setDisconnectCause(primary.getDisconnectCause()) + .setConnectionLabel(getConnectionLabel()) + .setConnectionIcon(getCallStateIcon()) + .setGatewayNumber(getGatewayNumber()) + .setCallSubject(shouldShowCallSubject(primary) ? primary.getCallSubject() : null) + .setCallbackNumber( + PhoneNumberHelper.formatNumber( + primary.getCallbackNumber(), primary.getSimCountryIso())) + .setIsWifi(primary.hasProperty(Details.PROPERTY_WIFI)) + .setIsConference( + primary.isConferenceCall() + && !primary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE)) + .setIsWorkCall(isWorkCall) + .setIsHdAttempting(isAttemptingHdAudioCall) + .setIsHdAudioCall(isHdAudioCall) + .setIsForwardedNumber( + !TextUtils.isEmpty(primary.getLastForwardedNumber()) + || primary.isCallForwarded()) + .setShouldShowContactPhoto(shouldShowContactPhoto) + .setConnectTimeMillis(primary.getConnectTimeMillis()) + .setIsVoiceMailNumber(primary.isVoiceMailNumber()) + .setIsRemotelyHeld(primary.isRemotelyHeld()) + .setIsBusinessNumber(isBusiness) + .setSupportsCallOnHold(supports2ndCallOnHold()) + .setSwapToSecondaryButtonState(getSwapToSecondaryButtonState()) + .setIsAssistedDialed(primary.isAssistedDialed()) + .setCustomLabel(null) + .setAssistedDialingExtras(primary.getAssistedDialingExtras()) + .build()); InCallActivity activity = (InCallActivity) (inCallScreen.getInCallScreenFragment().getActivity()); |