Fix #655

app/src/main/res/layout/controller_call.xml

@@ -34,30 +34,6 @@
         android:layout_height="match_parent"
         android:visibility="invisible">
 
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true">
-
-            <com.facebook.drawee.view.SimpleDraweeView xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/call_control_switch_camera"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_horizontal|bottom"
-                android:layout_marginBottom="20dp"
-                app:backgroundImage="@color/colorPrimary"
-                app:placeholderImage="@drawable/ic_switch_video_white_24px"
-                app:roundAsCircle="true" />
-
-            <org.webrtc.SurfaceViewRenderer
-                android:id="@+id/pip_video_view"
-                android:layout_width="@dimen/large_preview_dimension"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="16dp"
-                android:visibility="invisible" />
-        </FrameLayout>
 
         <LinearLayout
             android:id="@+id/remote_renderers_layout"
@@ -135,6 +111,32 @@
             app:roundAsCircle="true" />
     </RelativeLayout>
 
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true">
+
+        <org.webrtc.SurfaceViewRenderer
+            android:id="@+id/pip_video_view"
+            android:layout_width="@dimen/large_preview_dimension"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="16dp"
+            android:visibility="invisible" />
+
+        <com.facebook.drawee.view.SimpleDraweeView xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/call_control_switch_camera"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_horizontal|bottom"
+            android:layout_marginBottom="20dp"
+            app:backgroundImage="@color/colorPrimary"
+            app:placeholderImage="@drawable/ic_switch_video_white_24px"
+            app:roundAsCircle="true" />
+
+    </FrameLayout>
+
     <include
         layout="@layout/call_states"
         android:layout_width="match_parent"