commit ad9659e62604309b0d95b0a1f9b19fd6a33990e9
author Dmitri Plotnikov <dplotnikov@google.com> Wed Oct 06 16:46:39 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Oct 06 16:46:39 2010 -0700
tree 733628548f29e3a4ced75b9e132e19b546bc7cf1
parent c41524cbba2a292e97768e0113385bc83764c4f9

Showing My Contacts if contact is NOT a member of it

Change-Id: I5da6ee72ddea68567028a6d129552a35a826a4f2

src/com/android/contacts/ui/widget/GroupMembershipView.java

diff --git a/src/com/android/contacts/ui/widget/GroupMembershipView.java b/src/com/android/contacts/ui/widget/GroupMembershipView.java
index 543820d..f141046 100644
--- a/src/com/android/contacts/ui/widget/GroupMembershipView.java
+++ b/src/com/android/contacts/ui/widget/GroupMembershipView.java
@@ -86,6 +86,8 @@
     private long mFavoritesGroupId;
     private ListPopupWindow mPopup;
     private DataKind mKind;
+    private boolean mDefaultGroupVisibilityKnown;
+    private boolean mDefaultGroupVisible;
 
     public GroupMembershipView(Context context) {
         super(context);
@@ -111,6 +113,7 @@
         ValuesDelta values = state.getValues();
         mAccountType = values.getAsString(RawContacts.ACCOUNT_TYPE);
         mAccountName = values.getAsString(RawContacts.ACCOUNT_NAME);
+        mDefaultGroupVisibilityKnown = false;
         updateView();
     }
 
@@ -162,11 +165,17 @@
 
         if (mGroupList == null) {
             mGroupList = (TextView) findViewById(R.id.group_list);
-            mGroupList.setOnClickListener(this);
+            setOnClickListener(this);
         }
 
         mGroupList.setText(sb);
         setVisibility(VISIBLE);
+
+        if (!mDefaultGroupVisibilityKnown) {
+            // Only show the default group (My Contacts) if the contact is NOT in it
+            mDefaultGroupVisible = mDefaultGroupId != 0 && !hasMembership(mDefaultGroupId);
+            mDefaultGroupVisibilityKnown = true;
+        }
     }
 
     @Override
@@ -185,7 +194,8 @@
             String accountType = mGroupMetaData.getString(GroupMetaDataLoader.ACCOUNT_TYPE);
             if (accountName.equals(mAccountName) && accountType.equals(mAccountType)) {
                 long groupId = mGroupMetaData.getLong(GroupMetaDataLoader.GROUP_ID);
-                if (groupId != mFavoritesGroupId && groupId != mDefaultGroupId) {
+                if (groupId != mFavoritesGroupId
+                        && (groupId != mDefaultGroupId || mDefaultGroupVisible)) {
                     String title = mGroupMetaData.getString(GroupMetaDataLoader.TITLE);
                     boolean checked = hasMembership(groupId);
                     mAdapter.add(new GroupSelectionItem(groupId, title, checked));