AI 143344: am: CL 143193 am: CL 142955 Send all contact method details for "Create barcode" intent.
This was regression from PF when we removed the list separator items when viewing contact.
Original author: jsharkey
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143344
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index ddacbe0..d3c51f3 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -421,20 +421,23 @@
Bundle bundle = new Bundle();
String name = mCursor.getString(CONTACT_NAME_COLUMN);
if (!TextUtils.isEmpty(name)) {
+ // Correctly handle when section headers are hidden
+ int sepAdjust = SHOW_SEPARATORS ? 1 : 0;
+
bundle.putString(Contacts.Intents.Insert.NAME, name);
// The 0th ViewEntry in each ArrayList below is a separator item
- int entriesToAdd = Math.min(mPhoneEntries.size() - 1, PHONE_KEYS.length);
+ int entriesToAdd = Math.min(mPhoneEntries.size() - sepAdjust, PHONE_KEYS.length);
for (int x = 0; x < entriesToAdd; x++) {
- ViewEntry entry = mPhoneEntries.get(x + 1);
+ ViewEntry entry = mPhoneEntries.get(x + sepAdjust);
bundle.putString(PHONE_KEYS[x], entry.data);
}
- entriesToAdd = Math.min(mEmailEntries.size() - 1, EMAIL_KEYS.length);
+ entriesToAdd = Math.min(mEmailEntries.size() - sepAdjust, EMAIL_KEYS.length);
for (int x = 0; x < entriesToAdd; x++) {
- ViewEntry entry = mEmailEntries.get(x + 1);
+ ViewEntry entry = mEmailEntries.get(x + sepAdjust);
bundle.putString(EMAIL_KEYS[x], entry.data);
}
- if (mPostalEntries.size() >= 2) {
- ViewEntry entry = mPostalEntries.get(1);
+ if (mPostalEntries.size() >= 1 + sepAdjust) {
+ ViewEntry entry = mPostalEntries.get(sepAdjust);
bundle.putString(Contacts.Intents.Insert.POSTAL, entry.data);
}
intent.putExtra("ENCODE_DATA", bundle);