Removing obsolete API and fixing ArrayIndexOutOfBoundsException
Change-Id: I42c2b7352bf52b1fee6fbde23681d770860a6fce
diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index f3d406d..a0dd32b 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -205,11 +205,6 @@
}
}
- public void moveToPosition(int position) {
- // For side-effect
- getItem(position);
- }
-
@Override
public int getCount() {
int count = super.getCount();
@@ -236,12 +231,11 @@
}
@Override
- protected View getView(int partition, Cursor cursor, int position, View convertView,
- ViewGroup parent) {
+ public View getView(int position, View convertView, ViewGroup parent) {
if (isSearchAllContactsItemPosition(position)) {
return LayoutInflater.from(getContext()).inflate(
R.layout.contacts_list_search_all_item, parent, false);
}
- return super.getView(partition, cursor, position, convertView, parent);
+ return super.getView(position, convertView, parent);
}
}
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index fa0558a..3dd80df 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -86,11 +86,9 @@
if (position == 0 && !isSearchMode() && isCreateContactEnabled()) {
createNewContact();
} else {
- adapter.moveToPosition(position);
editContact(adapter.getContactUri(position));
}
} else {
- adapter.moveToPosition(position);
viewContact(adapter.getContactUri(position));
}
}
diff --git a/src/com/android/contacts/list/PostalAddressPickerFragment.java b/src/com/android/contacts/list/PostalAddressPickerFragment.java
index 95ed7f8..6c429f2 100644
--- a/src/com/android/contacts/list/PostalAddressPickerFragment.java
+++ b/src/com/android/contacts/list/PostalAddressPickerFragment.java
@@ -46,12 +46,10 @@
// if (adapter.isSearchAllContactsItemPosition(position)) {
// searchAllContacts();
// } else {
- adapter.moveToPosition(position);
pickPostalAddress(adapter.getDataUri(position));
// }
} else {
LegacyPostalAddressListAdapter adapter = (LegacyPostalAddressListAdapter)getAdapter();
- adapter.moveToPosition(position);
pickPostalAddress(adapter.getContactMethodUri(position));
}
}
diff --git a/src/com/android/contacts/list/StrequentContactListFragment.java b/src/com/android/contacts/list/StrequentContactListFragment.java
index 4d2fd7f..264f2c0 100644
--- a/src/com/android/contacts/list/StrequentContactListFragment.java
+++ b/src/com/android/contacts/list/StrequentContactListFragment.java
@@ -51,7 +51,6 @@
@Override
protected void onItemClick(int position, long id) {
ContactListAdapter adapter = getAdapter();
- adapter.moveToPosition(position);
viewContact(adapter.getContactUri(position));
}
@@ -94,7 +93,6 @@
case CALL_BUTTON_ID: {
final int position = (Integer)v.getTag();
ContactListAdapter adapter = getAdapter();
- adapter.moveToPosition(position);
callContact(adapter.getContactUri(position));
break;
}