Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved string used for delete contact button + updated test for contact deletion

Browse source
This commit is contained in:
Sylvain Berfini 2014-11-25 11:28:39 +01:00
parent e462133076
commit f22667520e
6 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/layout-sw533dp-land/contact.xml
View file

@ -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"

2
res/layout/contact.xml
View file

@ -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"

2
res/values-fr/strings.xml
View file

@ -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>

2
res/values-ru/strings.xml
View file

@ -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>

2
res/values/strings.xml
View file

@ -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>

12
tests/src/org/linphone/test/Contacts.java
View file

@ -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)));
}