From 16d02ef317f8f6432ec0629af4f557911ae16027 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Fri, 30 Sep 2011 14:36:19 +0200
Subject: [PATCH] Close button below dtmf dialpad on conference activity.

---
 res/values/strings.xml                   |  2 ++
 src/org/linphone/ConferenceActivity.java | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f923f6094..020dafc25 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,6 +10,8 @@
 
 	<string name="skipable_error_service_not_ready">Warning: service is not ready</string>
 
+	<string name="close_button_text">Close</string>
+	
 	<string name="status_conf_call">conf</string>
 	<string name="status_active_call">active</string>
 	<string name="state_paused">paused</string>
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 874d524e1..eadcdf593 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -178,13 +178,13 @@ public class ConferenceActivity extends ListActivity implements
 					getLayoutInflater().inflate(R.layout.numpad, null))
 			// .setIcon(R.drawable.logo_linphone_57x57)
 					// .setTitle("Send DTMFs")
-					// .setPositiveButton("hide", new
-					// DialogInterface.OnClickListener() {
-					// public void onClick(DialogInterface dialog, int whichButton)
-					// {
-					// dismissDialog(id);
-					// }
-					// })
+					 .setPositiveButton(getString(R.string.close_button_text), new
+					 DialogInterface.OnClickListener() {
+					 public void onClick(DialogInterface dialog, int whichButton)
+					 {
+					 dismissDialog(id);
+					 }
+					 })
 					.create();
 		default:
 			throw new RuntimeException("unkown dialog id " + id);