am 80dec847: Merge "Cherry-picking I25bf497e for MR1" into ics-mr1 (939532e0) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/detail/ContactDetailFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -951,7 +951,7 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen
		if (group.getGroupId() == groupId) {
		if (!group.isDefaultGroup() && !group.isFavorites()) {
		String title = group.getTitle();
		if (!groups.contains(title)) {
		if (!TextUtils.isEmpty(title) && !groups.contains(title)) {
		groups.add(title);
		}
		}

+6 −3

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.content.res.Resources;
		import android.database.Cursor;
		import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
		import android.provider.ContactsContract.RawContacts;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.View.OnClickListener;
		@@ -182,6 +183,7 @@ public class GroupMembershipView extends LinearLayout
		if (groupId != mFavoritesGroupId && groupId != mDefaultGroupId
		&& hasMembership(groupId)) {
		String title = mGroupMetaData.getString(GroupMetaDataLoader.TITLE);
		if (!TextUtils.isEmpty(title)) {
		if (sb.length() != 0) {
		sb.append(", ");
		}
		@@ -189,6 +191,7 @@ public class GroupMembershipView extends LinearLayout
		}
		}
		}
		}

		if (!accountHasGroups) {
		setVisibility(GONE);