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/answer/impl/AnswerFragment.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/answer/impl/AnswerFragment.java')
| -rw-r--r-- | java/com/android/incallui/answer/impl/AnswerFragment.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 3439a3e3c..4729b41ba 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -858,7 +858,7 @@ public class AnswerFragment extends Fragment public void onAnswerProgressUpdate(@FloatRange(from = -1f, to = 1f) float answerProgress) { // Don't fade the window background for call waiting or video upgrades. Fading the background // shows the system wallpaper which looks bad because on reject we switch to another call. - if (primaryCallState.state == State.INCOMING && !isVideoCall()) { + if (primaryCallState.state() == State.INCOMING && !isVideoCall()) { answerScreenDelegate.updateWindowBackgroundColor(answerProgress); } @@ -969,7 +969,7 @@ public class AnswerFragment extends Fragment if (hasCallOnHold()) { getAnswerMethod() .setHintText(getText(R.string.call_incoming_default_label_answer_and_release_third)); - } else if (primaryCallState.supportsCallOnHold) { + } else if (primaryCallState.supportsCallOnHold()) { getAnswerMethod() .setHintText(getText(R.string.call_incoming_default_label_answer_and_release_second)); } @@ -1048,9 +1048,9 @@ public class AnswerFragment extends Fragment private boolean canRejectCallWithSms() { return primaryCallState != null - && !(primaryCallState.state == State.DISCONNECTED - || primaryCallState.state == State.DISCONNECTING - || primaryCallState.state == State.IDLE); + && !(primaryCallState.state() == State.DISCONNECTED + || primaryCallState.state() == State.DISCONNECTING + || primaryCallState.state() == State.IDLE); } private void createInCallScreenDelegate() { |