From 2d28121e0eaf34f9216eb97e4abdfd2a3bc8f26a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Mon, 27 Jan 2014 11:16:35 +0100
Subject: [PATCH] Fixed delete contact test on 7 thumbs tablets

---
 res/layout/contact.xml                    |  1 -
 res/layout/edit_contact.xml               |  1 +
 tests/src/org/linphone/test/Contacts.java | 14 ++++++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/res/layout/contact.xml b/res/layout/contact.xml
index ef731bbd8..f453ac46a 100644
--- a/res/layout/contact.xml
+++ b/res/layout/contact.xml
@@ -52,7 +52,6 @@
     </LinearLayout>
     
     <ScrollView
-        android:id="@+id/controlsScrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         
diff --git a/res/layout/edit_contact.xml b/res/layout/edit_contact.xml
index 49747f831..fa2e0479a 100644
--- a/res/layout/edit_contact.xml
+++ b/res/layout/edit_contact.xml
@@ -43,6 +43,7 @@
     </LinearLayout>
     
     <ScrollView
+        android:id="@+id/controlsScrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     
diff --git a/tests/src/org/linphone/test/Contacts.java b/tests/src/org/linphone/test/Contacts.java
index 2d7f01158..60470350c 100644
--- a/tests/src/org/linphone/test/Contacts.java
+++ b/tests/src/org/linphone/test/Contacts.java
@@ -107,12 +107,18 @@ public class Contacts extends SampleTest {
 		
 		solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
 		
-		//Scroll down a bit on some small screens to see the delete button
-		((ScrollView)solo.getView(aContext.getString(org.linphone.R.id.controlsScrollView))).fullScroll(View.FOCUS_DOWN);
-		
 		solo.clickOnText(aContext.getString(org.linphone.R.string.button_edit));
-		solo.clickOnText(aContext.getString(org.linphone.R.string.delete_contact));
 		
+		// 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)));
 	}