From f6afe8b15e1c5db4f1fd453945f1ff9ace354fea Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 9 Dec 2011 16:26:19 +0100
Subject: [PATCH] Terminate conference button in the conf details activity.

---
 res/layout/conference_details_layout.xml        | 9 +++++++--
 src/org/linphone/ConferenceDetailsActivity.java | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/layout/conference_details_layout.xml b/res/layout/conference_details_layout.xml
index 7290b364f..044b7cb78 100644
--- a/res/layout/conference_details_layout.xml
+++ b/res/layout/conference_details_layout.xml
@@ -26,8 +26,13 @@
 				ui:unchecked="@drawable/incall_micro"
 				ui:bgdrawables="true" />
 
-		<ImageView android:src="@android:color/darker_gray" style="@style/incall_control" />
-	    <org.linphone.ui.ToggleImageButton android:id="@+id/toggleSpeaker"
+		<ImageButton
+			android:id="@+id/incallHang"
+			style="@style/incall_control"
+			android:background="@drawable/clavier_bg"
+			android:src="@drawable/stopcall_red" />
+
+		<org.linphone.ui.ToggleImageButton android:id="@+id/toggleSpeaker"
 	            style="@style/incall_control"
 				ui:checked="@drawable/incall_speaker_inverse"
 				ui:unchecked="@drawable/incall_speaker"
diff --git a/src/org/linphone/ConferenceDetailsActivity.java b/src/org/linphone/ConferenceDetailsActivity.java
index 6555315e0..07c2fd64f 100644
--- a/src/org/linphone/ConferenceDetailsActivity.java
+++ b/src/org/linphone/ConferenceDetailsActivity.java
@@ -51,6 +51,13 @@ public class ConferenceDetailsActivity extends AbstractCalleesActivity  {
 			return;
 		}
 		setContentView(R.layout.conference_details_layout);
+		View v=findViewById(R.id.incallHang);
+		v.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				lc().terminateConference();
+			}
+		});
 		super.onCreate(savedInstanceState);
 	}