commit 04bad51421ca4adab40900324dc2e108f5554e04
author Dmitri Plotnikov <dplotnikov@google.com> Mon Jan 17 12:43:01 2011 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Jan 17 12:43:01 2011 -0800
tree d98a2d18264e94d5b57d258d33fd90b1eae6b68d
parent 1fbcbd1053c72e165009ad9a7d735dd2c0755c36

Fixing issues with default selection in GAL results

Change-Id: I6246b3c409a0ffd24029e3cc276dfc2644bcb931

src/com/android/contacts/list/ContactBrowseListFragment.java

diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index 03684f2..372e4e1 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -556,6 +556,7 @@
     public void reloadData() {
         if (mStartedLoading) {
             mSelectionVerified = false;
+            mLastSelectedPosition = -1;
             super.reloadData();
         }
     }

src/com/android/contacts/list/ContactListAdapter.java

diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index ffe9fc6..ed38fa3 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -218,7 +218,8 @@
             return true;
         }
 
-        return getSelectedContactId() == cursor.getLong(CONTACT_ID_COLUMN_INDEX);
+        return directoryId != Directory.DEFAULT && directoryId != Directory.LOCAL_INVISIBLE
+                && getSelectedContactId() == cursor.getLong(CONTACT_ID_COLUMN_INDEX);
     }
 
     @Override
@@ -321,7 +322,9 @@
                     break;
                 }
             }
-            if (mSelectedContactId != 0) {
+            if (mSelectedContactId != 0 &&
+                    mSelectedContactDirectoryId !=  Directory.DEFAULT &&
+                    mSelectedContactDirectoryId !=  Directory.LOCAL_INVISIBLE) {
                 long contactId = cursor.getLong(CONTACT_ID_COLUMN_INDEX);
                 if (contactId == mSelectedContactId) {
                     offset = cursor.getPosition();