Merge "Use FAB to create a contact in a specific account"
diff --git a/src/com/android/contacts/activities/GroupMembersActivity.java b/src/com/android/contacts/activities/GroupMembersActivity.java
index 7ff5ba0..2c734d8 100644
--- a/src/com/android/contacts/activities/GroupMembersActivity.java
+++ b/src/com/android/contacts/activities/GroupMembersActivity.java
@@ -28,6 +28,7 @@
import android.provider.ContactsContract.Intents;
import android.provider.ContactsContract.RawContacts;
import android.support.v4.view.GravityCompat;
+import android.support.v7.app.ActionBar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -188,6 +189,10 @@
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("");
+
// Decide whether to prompt for the account and group name or start loading existing members
if (mIsInsertAction) {
// Check if we are in the middle of the insert flow.
@@ -602,11 +607,18 @@
public void onGroupMetadataLoaded(GroupMetadata groupMetadata) {
mGroupMetadata = groupMetadata;
if (!mIsInsertAction) {
- getSupportActionBar().setTitle(mGroupMetadata.groupName);
+ setActionBarTitle(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);