Merge "Add account header to label view." (6f164197) · Commits · e / os / android_packages_apps_Contacts

res/values/strings.xml

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -288,13 +288,6 @@
	<!-- The text displayed when the contacts list is empty while displaying all contacts [CHAR LIMIT=NONE] -->		<!-- The text displayed when the contacts list is empty while displaying all contacts [CHAR LIMIT=NONE] -->
	<string name="noContacts">No contacts</string>		<string name="noContacts">No contacts</string>

	<!-- Label list header title with the number of members in the label. [CHAR LIMIT=30] -->
	<plurals name="group_members_count">
	<item quantity="zero">No contacts</item>
	<item quantity="one">1 contact</item>
	<item quantity="other"><xliff:g id="count">%d</xliff:g> contacts</item>
	</plurals>

	<!-- The text displayed when the labels list is empty while displaying all labels [CHAR LIMIT=30] -->		<!-- The text displayed when the labels list is empty while displaying all labels [CHAR LIMIT=30] -->
	<string name="noGroups">No labels.</string>		<string name="noGroups">No labels.</string>

src/com/android/contacts/group/GroupMembersFragment.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -285,8 +285,8 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM

	final TextView accountFilterHeader = (TextView) accountFilterContainer.findViewById(		final TextView accountFilterHeader = (TextView) accountFilterContainer.findViewById(
	R.id.account_filter_header);		R.id.account_filter_header);
	accountFilterHeader.setText(getResources().getQuantityString(		accountFilterHeader.setText(mGroupMetadata.accountName);
	R.plurals.group_members_count, memberCount, memberCount));		accountFilterHeader.setAllCaps(false);
	} else {		} else {
	accountFilterContainer.setVisibility(View.GONE);		accountFilterContainer.setVisibility(View.GONE);
	}		}

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

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.view.MenuInflater;
	import android.view.MenuItem;		import android.view.MenuItem;
	import android.view.View;		import android.view.View;
	import android.view.ViewGroup;		import android.view.ViewGroup;
			import android.widget.TextView;

	import com.android.contacts.activities.ContactSelectionActivity;		import com.android.contacts.activities.ContactSelectionActivity;
	import com.android.contacts.common.R;		import com.android.contacts.common.R;
	@@ -185,6 +186,7 @@ public class GroupMemberPickerFragment extends
	setPhotoLoaderEnabled(true);		setPhotoLoaderEnabled(true);
	setSectionHeaderDisplayEnabled(true);		setSectionHeaderDisplayEnabled(true);
	setHasOptionsMenu(true);		setHasOptionsMenu(true);
			setDisplayDirectoryHeader(false);
	}		}

	@Override		@Override
	@@ -227,6 +229,15 @@ public class GroupMemberPickerFragment extends
	// Wait until contacts are loaded before showing the scrollbar		// Wait until contacts are loaded before showing the scrollbar
	setVisibleScrollbarEnabled(true);		setVisibleScrollbarEnabled(true);

			// Bind account filter header.
			final View accountFilterContainer = getView().findViewById(
			R.id.account_filter_header_container);
			accountFilterContainer.setVisibility(View.VISIBLE);
			final TextView accountFilterHeader = (TextView) accountFilterContainer.findViewById(
			R.id.account_filter_header);
			accountFilterHeader.setText(mAccountName);
			accountFilterHeader.setAllCaps(false);

	super.onLoadFinished(loader, new FilterCursorWrapper(data));		super.onLoadFinished(loader, new FilterCursorWrapper(data));
	}		}
	}		}