diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-01 18:01:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-01 18:01:15 +0000 |
commit | 2e72cdf3c154d308613f3516882e38f666ba1097 (patch) | |
tree | 35825f02ce30399bc8b7bdf9a298ebff8affab14 /java/com/android/incallui/video/impl | |
parent | 4865a35f4b6eb3c0f987ac0917ee2a775429e447 (diff) | |
parent | 9e335e2d4fb43b22c7f95b2e9d4e048798e8e239 (diff) |
Merge changes I3d2b23b5,I9463e2c9
* changes:
Updating SecondaryInfo value class to use AutoValue with builder pattern.
Added same primes metrics that existed in Dialtacts to NUI.
Diffstat (limited to 'java/com/android/incallui/video/impl')
3 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index 631cc1d68..28ee774ba 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -846,7 +846,7 @@ public class SurfaceViewVideoCallFragment extends Fragment updateButtonStates(); FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); Fragment oldBanner = getChildFragmentManager().findFragmentById(R.id.videocall_on_hold_banner); - if (secondaryInfo.shouldShow) { + if (secondaryInfo.shouldShow()) { OnHoldFragment onHoldFragment = OnHoldFragment.newInstance(secondaryInfo); onHoldFragment.setPadTopInset(!isInFullscreenMode); transaction.replace(R.id.videocall_on_hold_banner, onHoldFragment); diff --git a/java/com/android/incallui/video/impl/SwitchOnHoldCallController.java b/java/com/android/incallui/video/impl/SwitchOnHoldCallController.java index 372b56b4e..3efdfd7fa 100644 --- a/java/com/android/incallui/video/impl/SwitchOnHoldCallController.java +++ b/java/com/android/incallui/video/impl/SwitchOnHoldCallController.java @@ -74,7 +74,7 @@ public class SwitchOnHoldCallController implements OnClickListener { } private boolean hasSecondaryInfo() { - return secondaryInfo != null && secondaryInfo.shouldShow; + return secondaryInfo != null && secondaryInfo.shouldShow(); } public void updateButtonState() { diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 0793d1830..6b5a9797f 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -887,7 +887,7 @@ public class VideoCallFragment extends Fragment updateButtonStates(); FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); Fragment oldBanner = getChildFragmentManager().findFragmentById(R.id.videocall_on_hold_banner); - if (secondaryInfo.shouldShow) { + if (secondaryInfo.shouldShow()) { OnHoldFragment onHoldFragment = OnHoldFragment.newInstance(secondaryInfo); onHoldFragment.setPadTopInset(!isInFullscreenMode); transaction.replace(R.id.videocall_on_hold_banner, onHoldFragment); |