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

Commit d6d5ad50 authored by Marcus Hagerott's avatar Marcus Hagerott
Browse files

Revert "Fix title when account screen is opened from group." 

This reverts commit c1698713.

This fix introduced a new bug.

Bug 32337882
Change-Id: I62baca4a5808f35911838a09a4abe48adc086581
parent 314129bf

src/com/android/contacts/ContactsDrawerActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -420,7 +420,8 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 
                        mToggle.runWhenIdle(new Runnable() {

                            @Override

                            public void run() {

                                onGroupMenuItemClicked(groupListItem);

                                onGroupMenuItemClicked(groupListItem.getGroupId(),

                                        groupListItem.getTitle());

                                updateMenuSelection(menuItem);

                            }

                        });
@@ -491,7 +492,7 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 
        return isGroupView() || isAssistantView();

    }



    protected abstract void onGroupMenuItemClicked(GroupListItem group);

    protected abstract void onGroupMenuItemClicked(long groupId, String title);



    protected void onCreateGroupMenuItemClicked() {

        // Select the account to create the group
@@ -586,7 +587,6 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 
    }



    protected void onFilterMenuItemClicked(Intent intent) {

        resetFilter();

        AccountFilterUtil.handleAccountFilterResult(mContactListFilterController,

                AppCompatActivity.RESULT_OK, intent);

    }

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

+5 −10
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.FragmentManager; 
import android.app.FragmentTransaction;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.ContentUris;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;
@@ -29,6 +30,7 @@ import android.content.SyncStatusObserver; 
import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.provider.ContactsContract;

import android.provider.ContactsContract.ProviderStatus;

import android.support.design.widget.CoordinatorLayout;

import android.support.design.widget.Snackbar;
@@ -65,7 +67,6 @@ import com.android.contacts.common.util.AccountFilterUtil; 
import com.android.contacts.common.util.Constants;

import com.android.contacts.common.util.ImplicitIntentsUtil;

import com.android.contacts.common.widget.FloatingActionButtonController;

import com.android.contacts.group.GroupListItem;

import com.android.contacts.group.GroupMembersFragment;

import com.android.contacts.group.GroupMetaData;

import com.android.contacts.group.GroupUtil;
@@ -769,18 +770,12 @@ public class PeopleActivity extends ContactsDrawerActivity { 
    }



    @Override

    protected void onGroupMenuItemClicked(GroupListItem group) {

    protected void onGroupMenuItemClicked(long groupId, String title) {

        if (isGroupView() && mMembersFragment != null

                && mMembersFragment.isCurrentGroup(group.getGroupId())) {

                && mMembersFragment.isCurrentGroup(groupId)) {

            return;

        }

        mGroupUri = group.getUri();

        // Set the filter. This isn't used by the GroupMembersFragment but makes sure that the

        // filter will change when switching to a different view from the GroupMembersFragment.

        mContactListFilterController.setContactListFilter(

                ContactListFilter.createGroupMembersFilter(group.getAccountName(),

                        group.getAccountType(), group.getDataSet()), /* persistent */ false,

                /* notifyListeners */ false);

        mGroupUri = ContentUris.withAppendedId(ContactsContract.Groups.CONTENT_URI, groupId);

        switchToOrUpdateGroupView(GroupUtil.ACTION_SWITCH_GROUP);

    }

src/com/android/contacts/common/list/ContactListFilterController.java

+1 −5
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ public abstract class ContactListFilterController { 
     */

    public abstract void setContactListFilter(ContactListFilter filter, boolean persistent);



    public abstract void setContactListFilter(ContactListFilter filter, boolean persistent,

            boolean notifyListeners);



    public abstract void selectCustomFilter();



    /**
@@ -142,8 +139,7 @@ class ContactListFilterControllerImpl extends ContactListFilterController { 
        setContactListFilter(filter, persistent, /* notifyListeners */ true);

    }



    @Override

    public void setContactListFilter(ContactListFilter filter, boolean persistent,

    private void setContactListFilter(ContactListFilter filter, boolean persistent,

            boolean notifyListeners) {

        if (!filter.equals(mFilter)) {

            mFilter = filter;

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

+0 −8
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ 
 */

package com.android.contacts.group;



import android.content.ContentUris;

import android.net.Uri;

import android.provider.ContactsContract;



/**

 * Meta-data for a contact group.  We load all groups associated with the contact's

 * constituent accounts.
@@ -87,8 +83,4 @@ public final class GroupListItem { 
    public String getSystemId() {

        return mSystemId;

    }



    public Uri getUri() {

        return ContentUris.withAppendedId(ContactsContract.Groups.CONTENT_URI, mGroupId);

    }

}
 
 No newline at end of file