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

Fix contact edition

Browse source
This commit is contained in:
Margaux Clerc 2016-02-22 15:18:58 +01:00
parent bc57fde9c9
commit abb3be9421
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/layout/contact_edit_row.xml
View file

@ -18,7 +18,7 @@
android:layout_toStartOf="@+id/delete"/> android:layout_toStartOf="@+id/delete"/>
<ImageView <ImageView
android:id="@+id/delete" android:id="@+id/delete_field"
android:src="@drawable/delete_field_default" android:src="@drawable/delete_field_default"
android:contentDescription="@string/content_description_add" android:contentDescription="@string/content_description_add"
android:layout_gravity="center" android:layout_gravity="center"

4
src/org/linphone/ContactEditorFragment.java
View file

@ -588,7 +588,7 @@ public class ContactEditorFragment extends Fragment {
nounoa.setNewNumberOrAddress(noa.getText().toString()); nounoa.setNewNumberOrAddress(noa.getText().toString());
} }
ImageView delete = (ImageView) view.findViewById(R.id.delete); ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -626,7 +626,7 @@ public class ContactEditorFragment extends Fragment {
} }
}); });
final ImageView delete = (ImageView) view.findViewById(R.id.delete); final ImageView delete = (ImageView) view.findViewById(R.id.delete_field);
delete.setOnClickListener(new OnClickListener() { delete.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {

2
tests/src/org/linphone/test/CallsAudio.java
View file

@ -50,7 +50,7 @@ public class CallsAudio extends SampleTest {
assertOutgoingCallIsCorrectlyRunning(); assertOutgoingCallIsCorrectlyRunning();
solo.clickOnView(solo.getView(org.linphone.R.id.hang_up)); solo.clickOnView(solo.getView(org.linphone.R.id.outgoing_hang_up));
solo.waitForActivity("LinphoneActivity", 5000); solo.waitForActivity("LinphoneActivity", 5000);
solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class); solo.assertCurrentActivity("Expected Linphone Activity", LinphoneActivity.class);
} }

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

@ -77,7 +77,7 @@ public class Contacts extends SampleTest {
solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name)); solo.clickOnText(iContext.getString(org.linphone.test.R.string.contact_name));
solo.clickOnView(solo.getView(org.linphone.R.id.editContact)); solo.clickOnView(solo.getView(org.linphone.R.id.editContact));
solo.clickOnView(solo.getView(org.linphone.R.id.delete)); solo.clickOnView(solo.getView(org.linphone.R.id.delete_field));
solo.enterText(2, iContext.getString(org.linphone.test.R.string.contact_sip)); solo.enterText(2, iContext.getString(org.linphone.test.R.string.contact_sip));
solo.clickOnView(solo.getView(org.linphone.R.id.ok)); solo.clickOnView(solo.getView(org.linphone.R.id.ok));