From f3fe215bc09270adc3a25f6d3dc289b1dc1f518b Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 6 Nov 2015 17:37:45 +0100
Subject: [PATCH] Update call view

---
 res/layout/call.xml                | 6 +++---
 src/org/linphone/CallActivity.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/layout/call.xml b/res/layout/call.xml
index dce208b02..7cd1c212d 100644
--- a/res/layout/call.xml
+++ b/res/layout/call.xml
@@ -65,7 +65,7 @@
 							android:orientation="vertical">
 
 							<TextView
-								android:id="@+id/contact_name"
+								android:id="@+id/current_contact_name"
 								style="@style/font5"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
@@ -74,11 +74,11 @@
 								android:layout_gravity="center"/>
 
 							<Chronometer
-								android:id="@+id/call_timer"
+								android:id="@+id/current_call_timer"
 								style="@style/font2"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
-								android:layout_below="@id/contact_name"
+								android:layout_below="@id/current_contact_name"
 								android:layout_gravity="center"/>
 						</LinearLayout>
 
diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 85e5c02f8..57b7572d9 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -1470,7 +1470,7 @@ public class CallActivity extends Activity implements OnClickListener {
 		//}
 
 		LinphoneAddress lAddress = call.getRemoteAddress();
-		TextView contactName = (TextView) findViewById(R.id.contact_name);
+		TextView contactName = (TextView) findViewById(R.id.current_contact_name);
 
 		setContactInformation(contactName, contactPicture, lAddress);
 		registerCallDurationTimer(null, call);
@@ -1547,7 +1547,7 @@ public class CallActivity extends Activity implements OnClickListener {
 
 		Chronometer timer;
 		if(v == null){
-			timer = (Chronometer) findViewById(R.id.call_timer);
+			timer = (Chronometer) findViewById(R.id.current_call_timer);
 		} else {
 			timer = (Chronometer) v.findViewById(R.id.call_timer);
 		}