Merge "Support gmail's exchange account type" into lmp-dev
diff --git a/src/com/android/contacts/common/CallUtil.java b/src/com/android/contacts/common/CallUtil.java
index ea53571..307c975 100644
--- a/src/com/android/contacts/common/CallUtil.java
+++ b/src/com/android/contacts/common/CallUtil.java
@@ -36,6 +36,7 @@
public static final String SCHEME_MAILTO = "mailto";
public static final String SCHEME_IMTO = "imto";
public static final String SCHEME_SIP = "sip";
+ public static final String SCHEME_VOICEMAIL = "voicemail";
/**
* Return an Intent for making a phone call. Scheme (e.g. tel, sip) will be determined
diff --git a/src/com/android/contacts/common/list/ContactListAdapter.java b/src/com/android/contacts/common/list/ContactListAdapter.java
index 00aff43..53e589e 100644
--- a/src/com/android/contacts/common/list/ContactListAdapter.java
+++ b/src/com/android/contacts/common/list/ContactListAdapter.java
@@ -142,7 +142,7 @@
protected static Uri buildSectionIndexerUri(Uri uri) {
return uri.buildUpon()
- .appendQueryParameter(Contacts.ADDRESS_BOOK_INDEX_EXTRAS, "true").build();
+ .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true").build();
}
@Override
diff --git a/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java b/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
index 1bd7e77..7b4a3cd 100644
--- a/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
+++ b/src/com/android/contacts/common/list/ContactListPinnedHeaderView.java
@@ -45,13 +45,14 @@
R.styleable.ContactListItemView_list_item_text_offset_top, 0);
int paddingStartOffset = a.getDimensionPixelSize(
R.styleable.ContactListItemView_list_item_padding_left, 0);
+ int textWidth = getResources().getDimensionPixelSize(
+ R.dimen.contact_list_section_header_width);
+ int widthIncludingPadding = paddingStartOffset + textWidth;
a.recycle();
setBackgroundColor(backgroundColor);
setTextAppearance(getContext(), R.style.SectionHeaderStyle);
- setLayoutParams(new LayoutParams(
- getResources().getDimensionPixelSize(R.dimen.contact_list_section_header_width),
- LayoutParams.WRAP_CONTENT));
+ setLayoutParams(new LayoutParams(widthIncludingPadding, LayoutParams.WRAP_CONTENT));
setLayoutDirection(parent.getLayoutDirection());
setGravity(Gravity.CENTER_VERTICAL |
(ViewUtil.isViewLayoutRtl(this) ? Gravity.RIGHT : Gravity.LEFT));
diff --git a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
index 053b769..d6987c5 100644
--- a/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/common/list/PhoneNumberListAdapter.java
@@ -175,7 +175,7 @@
builder = baseUri.buildUpon().appendQueryParameter(
ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT));
if (isSectionHeaderDisplayEnabled()) {
- builder.appendQueryParameter(Phone.ADDRESS_BOOK_INDEX_EXTRAS, "true");
+ builder.appendQueryParameter(Phone.EXTRA_ADDRESS_BOOK_INDEX, "true");
}
applyFilter(loader, builder, directoryId, getFilter());
}