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/callpending/CallPendingActivity.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/callpending/CallPendingActivity.java')
| -rw-r--r-- | java/com/android/incallui/callpending/CallPendingActivity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/incallui/callpending/CallPendingActivity.java b/java/com/android/incallui/callpending/CallPendingActivity.java index 306eed8fb..c7ce2b108 100644 --- a/java/com/android/incallui/callpending/CallPendingActivity.java +++ b/java/com/android/incallui/callpending/CallPendingActivity.java @@ -147,8 +147,10 @@ public class CallPendingActivity extends FragmentActivity (InCallScreen) getSupportFragmentManager().findFragmentByTag(TAG_IN_CALL_SCREEN); inCallScreen.setPrimary(createPrimaryInfo()); inCallScreen.setCallState( - PrimaryCallState.createEmptyPrimaryCallStateWithState( - State.CALL_PENDING, getCallPendingLabel())); + PrimaryCallState.builder() + .setState(State.CALL_PENDING) + .setCustomLabel(getCallPendingLabel()) + .build()); inCallScreen.setEndCallButtonEnabled(true, true); } |