Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed226758 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Avoid showing "Contacts" title before group metadata is loaded.

Bug 29455543

Change-Id: Ia6866dfd036b4d33f3e9ae39c438943a4a6de6c2
parent e898f380
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.provider.ContactsContract;
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 @@ 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("");

        // 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 class GroupMembersActivity extends ContactsDrawerActivity implements
    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);