Merge "Set group activity title to label name." into ub-contactsdialer-f-dev (0448d97f) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/GroupMembersActivity.java

+2 −12

Original line number	Diff line number	Diff line
		@@ -186,6 +186,7 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements
		mGroupMetadata = savedState.getParcelable(KEY_GROUP_METADATA);
		} else {
		mGroupUri = getIntent().getData();
		setTitle(getIntent().getStringExtra(GroupUtil.EXTRA_GROUP_NAME));
		}
		if (mGroupUri == null) {
		setResultCanceledAndFinish(R.string.groupLoadErrorToast);
		@@ -201,10 +202,6 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements
		R.string.enter_contact_name);
		mActionBarAdapter.setShowHomeIcon(true);

		// Avoid showing default "Contacts" title before group metadata is loaded. The title will
		// be changed to group name when onGroupMetadataLoaded() is called.
		setActionBarTitle(getIntent().getStringExtra(GroupUtil.EXTRA_GROUP_NAME));

		// Add the members list fragment
		final FragmentManager fragmentManager = getFragmentManager();
		mMembersFragment = (GroupMembersFragment)
		@@ -580,17 +577,10 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements
		public void onGroupMetadataLoaded(GroupMetadata groupMetadata) {
		mGroupMetadata = groupMetadata;
		updateGroupMenu(mGroupMetadata);
		setActionBarTitle(mGroupMetadata.groupName);
		setTitle(mGroupMetadata.groupName);
		invalidateOptionsMenu();
		}

		private void setActionBarTitle(String title) {
		final ActionBar actionBar = getSupportActionBar();
		if (actionBar != null) {
		actionBar.setTitle(title);
		}
		}

		@Override
		public void onGroupMetadataLoadFailed() {
		setResultCanceledAndFinish(R.string.groupLoadErrorToast);