From 98405109968e80c15c07c474b32d2d388c3a89dd Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 15 Apr 2019 14:52:13 +0200
Subject: [PATCH] Fixed incoming call display when early media and video

---
 .../org/linphone/call/CallIncomingActivity.java |  6 +++++-
 app/src/main/res/layout/call_incoming.xml       | 17 +++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/linphone/call/CallIncomingActivity.java b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
index 3e254dcbc..62f6adb83 100644
--- a/app/src/main/java/org/linphone/call/CallIncomingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
@@ -28,6 +28,7 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.TextureView;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -193,7 +194,10 @@ public class CallIncomingActivity extends LinphoneGenericActivity {
         mNumber.setText(address.asStringUriOnly());
 
         if (LinphonePreferences.instance().acceptIncomingEarlyMedia()) {
-            mCall.getCore().setNativeVideoWindowId(mVideoDisplay);
+            if (mCall.getCurrentParams().videoEnabled()) {
+                findViewById(R.id.avatar_layout).setVisibility(View.GONE);
+                mCall.getCore().setNativeVideoWindowId(mVideoDisplay);
+            }
         }
     }
 
diff --git a/app/src/main/res/layout/call_incoming.xml b/app/src/main/res/layout/call_incoming.xml
index 2a367b4f2..0d207e60a 100644
--- a/app/src/main/res/layout/call_incoming.xml
+++ b/app/src/main/res/layout/call_incoming.xml
@@ -33,13 +33,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/menu"
-        android:layout_below="@id/top_bar"
-        android:paddingTop="10dp">
+        android:layout_below="@id/top_bar">
 
         <RelativeLayout
             android:id="@+id/contact_detail"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content"
+            android:background="?attr/backgroundColor">
 
             <TextView
                 android:id="@+id/contact_name"
@@ -75,12 +75,13 @@
 
             </RelativeLayout>
 
-        </RelativeLayout>
+            <TextureView
+                android:id="@+id/videoSurface"
+                android:layout_below="@id/contact_number"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
 
-        <TextureView
-            android:id="@+id/videoSurface"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+        </RelativeLayout>
 
     </FrameLayout>