diff --git a/res/layout/contact_edit.xml b/res/layout/contact_edit.xml index da442c190..933c88ab2 100644 --- a/res/layout/contact_edit.xml +++ b/res/layout/contact_edit.xml @@ -136,6 +136,7 @@ android:inputType="textPersonName|textCapWords"/> false false + true + false true diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java index e24a0ccdd..1b43f9254 100644 --- a/src/org/linphone/ContactDetailsFragment.java +++ b/src/org/linphone/ContactDetailsFragment.java @@ -78,8 +78,9 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener deleteContact.setOnClickListener(this); organization = (TextView) view.findViewById(R.id.contactOrganization); + boolean isOrgVisible = getResources().getBoolean(R.bool.display_contact_organization); String org = contact.getOrganization(); - if (org != null && !org.isEmpty()) { + if (org != null && !org.isEmpty() && isOrgVisible) { organization.setText(org); } else { organization.setVisibility(View.GONE); diff --git a/src/org/linphone/ContactEditorFragment.java b/src/org/linphone/ContactEditorFragment.java index 1d555988a..56d77f816 100644 --- a/src/org/linphone/ContactEditorFragment.java +++ b/src/org/linphone/ContactEditorFragment.java @@ -204,9 +204,16 @@ public class ContactEditorFragment extends Fragment { } }); + organization = (EditText) view.findViewById(R.id.contactOrganization); - if (!isNewContact) { - organization.setText(contact.getOrganization()); + boolean isOrgVisible = getResources().getBoolean(R.bool.display_contact_organization); + if (!isOrgVisible) { + organization.setVisibility(View.GONE); + view.findViewById(R.id.contactOrganizationTitle).setVisibility(View.GONE); + } else { + if (!isNewContact) { + organization.setText(contact.getOrganization()); + } } if (!isNewContact) { diff --git a/src/org/linphone/ContactsListFragment.java b/src/org/linphone/ContactsListFragment.java index fbc3d8673..de822fabe 100644 --- a/src/org/linphone/ContactsListFragment.java +++ b/src/org/linphone/ContactsListFragment.java @@ -501,8 +501,9 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O } TextView organization = (TextView) view.findViewById(R.id.contactOrganization); + boolean isOrgVisible = getResources().getBoolean(R.bool.display_contact_organization); String org = contact.getOrganization(); - if (org != null && !org.isEmpty()) { + if (org != null && !org.isEmpty() && isOrgVisible) { organization.setText(org); organization.setVisibility(View.VISIBLE); } else {