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/incall/impl | |
| 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/incall/impl')
| -rw-r--r-- | java/com/android/incallui/incall/impl/InCallFragment.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/incallui/incall/impl/InCallFragment.java b/java/com/android/incallui/incall/impl/InCallFragment.java index 9a6d1c41e..29160abef 100644 --- a/java/com/android/incallui/incall/impl/InCallFragment.java +++ b/java/com/android/incallui/incall/impl/InCallFragment.java @@ -321,11 +321,12 @@ public class InCallFragment extends Fragment LogUtil.i("InCallFragment.setCallState", primaryCallState.toString()); contactGridManager.setCallState(primaryCallState); getButtonController(InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY) - .setAllowed(primaryCallState.swapToSecondaryButtonState != ButtonState.NOT_SUPPORT); + .setAllowed(primaryCallState.swapToSecondaryButtonState() != ButtonState.NOT_SUPPORT); getButtonController(InCallButtonIds.BUTTON_SWITCH_TO_SECONDARY) - .setEnabled(primaryCallState.swapToSecondaryButtonState == ButtonState.ENABLED); + .setEnabled(primaryCallState.swapToSecondaryButtonState() == ButtonState.ENABLED); buttonChooser = - ButtonChooserFactory.newButtonChooser(voiceNetworkType, primaryCallState.isWifi, phoneType); + ButtonChooserFactory.newButtonChooser( + voiceNetworkType, primaryCallState.isWifi(), phoneType); updateButtonStates(); } |