1 files changed, 20 insertions, 13 deletions
diff --git a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
index fa4aaef1c..c67246675 100644
--- a/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
+++ b/java/com/android/incallui/video/impl/res/layout/frag_videocall_surfaceview.xml
@@ -1,10 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="@android:color/black"
-  android:orientation="vertical"
   android:keepScreenOn="true">
 
   <SurfaceView
@@ -33,17 +47,11 @@
     android:id="@+id/videocall_fullscreen_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/videocall_overlay_background_color"
-    tools:visibility="gone"/>
+    android:background="@color/videocall_overlay_background_color"/>
 
   <FrameLayout
-    android:id="@+id/videocall_preview_root"
-    android:layout_width="@dimen/videocall_preview_width"
-    android:layout_height="@dimen/videocall_preview_height"
-    android:layout_marginBottom="@dimen/videocall_preview_margin_bottom"
-    android:layout_marginStart="@dimen/videocall_preview_margin_start"
-    android:background="@android:color/black"
-    android:layout_gravity="bottom|start">
+    style="@style/VideoPreviewHolder"
+    android:id="@+id/videocall_preview_root">
 
     <SurfaceView
       android:id="@+id/videocall_video_preview"
@@ -81,11 +89,10 @@
     android:id="@+id/videocall_green_screen_background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/videocall_overlay_background_color"
-    tools:visibility="gone"/>
+    android:background="@color/videocall_overlay_background_color"/>
 
   <include
-    layout="@layout/videocall_controls"
+    layout="@layout/videocall_controls_surfaceview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>