diff options
| author | Oya Masafumi <masafumi.x.oya@sony.com> | 2019-04-16 18:36:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-16 18:36:45 -0700 |
| commit | 446449d287bc668c5cf2a8d0126f8f746578f2f7 (patch) | |
| tree | 90c7716871db8ac9c701b14d213998ddcb8af138 /java | |
| parent | 51dc2a559fd4b0cb4899affe9a7e8816d4f45e3d (diff) | |
| parent | 8e9d0529136d24e56cbfdc167cf20db4debe7dcb (diff) | |
Merge "Fix issue that the hold label is not shown during remote video holding" am: c1c93761a3 am: 12a51def3c
am: 8e9d052913
Change-Id: Ibe2491faa719e91668cccbdf72a9806d048ca24b
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/video/impl/VideoCallFragment.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java index 901facb01..db4806a52 100644 --- a/java/com/android/incallui/video/impl/VideoCallFragment.java +++ b/java/com/android/incallui/video/impl/VideoCallFragment.java @@ -696,9 +696,17 @@ public class VideoCallFragment extends Fragment videoCallScreenDelegate.getLocalVideoSurfaceTexture().attachToTextureView(previewTextureView); videoCallScreenDelegate.getRemoteVideoSurfaceTexture().attachToTextureView(remoteTextureView); - this.isRemotelyHeld = isRemotelyHeld; + boolean updateRemoteOffView = false; if (this.shouldShowRemote != shouldShowRemote) { this.shouldShowRemote = shouldShowRemote; + updateRemoteOffView = true; + } + if (this.isRemotelyHeld != isRemotelyHeld) { + this.isRemotelyHeld = isRemotelyHeld; + updateRemoteOffView = true; + } + + if (updateRemoteOffView) { updateRemoteOffView(); } if (this.shouldShowPreview != shouldShowPreview) { |