From f22667520eed09ec0994d9a36cf3b1dcd7afd9dc Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Tue, 25 Nov 2014 11:28:39 +0100
Subject: [PATCH] Improved string used for delete contact button + updated test
 for contact deletion

---
 res/layout-sw533dp-land/contact.xml       |  2 +-
 res/layout/contact.xml                    |  2 +-
 res/values-fr/strings.xml                 |  2 +-
 res/values-ru/strings.xml                 |  2 +-
 res/values/strings.xml                    |  2 +-
 tests/src/org/linphone/test/Contacts.java | 12 ------------
 6 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/res/layout-sw533dp-land/contact.xml b/res/layout-sw533dp-land/contact.xml
index 8fa764c63..206bf91f5 100644
--- a/res/layout-sw533dp-land/contact.xml
+++ b/res/layout-sw533dp-land/contact.xml
@@ -15,7 +15,7 @@
 			android:contentDescription="@string/content_description_delete"
 			android:id="@+id/deleteContact"
 			android:background="@drawable/contact_delete"
-			android:text="@string/button_delete_all"
+			android:text="@string/delete_contact"
 			android:gravity="center"
 			android:paddingTop="20dp"
 			android:textColor="@drawable/text_button"
diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index 9975d7a36..500f29ddd 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -15,7 +15,7 @@
 			android:contentDescription="@string/content_description_delete"
 			android:id="@+id/deleteContact"
 			android:background="@drawable/contact_delete"
-			android:text="@string/button_delete_all"
+			android:text="@string/delete_contact"
 			android:gravity="center"
 			android:paddingTop="20dp"
 			android:textColor="@drawable/text_button"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 48af44bc9..6d4e194f5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -301,7 +301,7 @@
   <string name="linphone_friend_new_request_desc">voudrait être partager son status avec vous et voir le votre.</string>
   <string name="setup_ec_calibration">Calibration de l\'annulateur d\'écho en cours</string>
   <string name="pref_image_sharing_server_title">Serveur de partage</string>
-  <string name="delete_contact">Supprimer contact</string>
+  <string name="delete_contact">Supprimer</string>
   <string name="sip_address">Adresse SIP</string>
   <string name="phone_number">Numéro de téléphone</string>
   <string name="contact_first_name">Prénom</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d96b0fbe0..efd94842b 100755
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -349,7 +349,7 @@
   <string name="setup_ec_calibration">Идёт настройка шумоподавления</string>
   <string name="pref_image_sharing_server_title">Общий сервер</string>
   <string name="pref_remote_provisioning_title">Удалённое резервирование</string>
-  <string name="delete_contact">Удалить контакт</string>
+  <string name="delete_contact">Удалить</string>
   <string name="sip_address">адрес SIP</string>
   <string name="phone_number">Номер телефона</string>
   <string name="contact_first_name">Имя</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28bf50116..5ddedbd24 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -375,7 +375,7 @@
   <string name="setup_ec_calibration">Echo canceller calibration in progress</string>
   <string name="pref_image_sharing_server_title">Sharing server</string>
   <string name="pref_remote_provisioning_title">Remote provisioning</string>
-  <string name="delete_contact">Delete contact</string>
+  <string name="delete_contact">Delete</string>
   <string name="sip_address">SIP address</string>
   <string name="phone_number">Phone number</string>
   <string name="contact_first_name">First name</string>
diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java
index 13a9ea336..3e7de61b4 100644
--- a/tests/src/org/linphone/test/Contacts.java
+++ b/tests/src/org/linphone/test/Contacts.java
@@ -110,18 +110,6 @@ public class Contacts extends SampleTest {
 		goToContacts();
 		
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
-		
-		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
-		
-		// Scroll down a bit on some small screens to see the delete button
-		final ScrollView scrollView = (ScrollView)solo.getView(org.linphone.R.id.controlsScrollView);
-		scrollView.getHandler().post(new Runnable() {
-			@Override
-			public void run() {
-				scrollView.fullScroll(View.FOCUS_DOWN);
-			}
-		});
-		solo.sleep(500);
 		solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact));
 		Assert.assertFalse(solo.searchText(iContext.getString(org.linphone.test.R.string.contact_name)));
 	}