diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-03 23:18:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 23:18:35 +0000 |
commit | 2034759538273aed8a0b412d8fb90994eba1f7ea (patch) | |
tree | 1a45d60921e293c6088efeaf4d9c408456f3e0e2 /java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java | |
parent | 86baedee44a4902097310c689ee3ae7f0cdb1c8d (diff) | |
parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) |
This change reflects the Dialer V10 RC00 branch. am: 8369df095a
am: d67f162752
Change-Id: I94f923a6a8af0a580723017002922e299bd335f3
Diffstat (limited to 'java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java')
-rw-r--r-- | java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java index a65274276..29aea1459 100644 --- a/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java +++ b/java/com/android/incallui/video/impl/SurfaceViewVideoCallFragment.java @@ -184,13 +184,7 @@ public class SurfaceViewVideoCallFragment extends Fragment LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) { LogUtil.i("SurfaceViewVideoCallFragment.onCreateView", null); - View view = - layoutInflater.inflate( - isLandscape() - ? R.layout.frag_videocall_land_surfaceview - : R.layout.frag_videocall_surfaceview, - viewGroup, - false); + View view = layoutInflater.inflate(R.layout.frag_videocall_surfaceview, viewGroup, false); contactGridManager = new ContactGridManager(view, null /* no avatar */, 0, false /* showAnonymousAvatar */); @@ -639,12 +633,6 @@ public class SurfaceViewVideoCallFragment extends Fragment shouldShowPreview, shouldShowRemote); - if (this.shouldShowPreview == shouldShowPreview - && this.shouldShowRemote == shouldShowRemote - && this.isRemotelyHeld == isRemotelyHeld) { - return; - } - this.shouldShowPreview = shouldShowPreview; this.shouldShowRemote = shouldShowRemote; this.isRemotelyHeld = isRemotelyHeld; |