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

Commit cf61e4f3 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Merge ContactsDrawerActivity and PeopleActivity (1/2)"

parents ff9950d8 84a21cc7
Loading
Loading
Loading
Loading
+0 −720

File deleted.

Preview size limit exceeded, changes collapsed.

+3 −3
Original line number Original line Diff line number Diff line
@@ -44,9 +44,9 @@ import android.widget.LinearLayout.LayoutParams;
import android.widget.SearchView.OnCloseListener;
import android.widget.SearchView.OnCloseListener;
import android.widget.TextView;
import android.widget.TextView;


import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.R;
import com.android.contacts.R;
import com.android.contacts.activities.ActionBarAdapter.Listener.Action;
import com.android.contacts.activities.ActionBarAdapter.Listener.Action;
import com.android.contacts.activities.PeopleActivity;
import com.android.contacts.compat.CompatUtils;
import com.android.contacts.compat.CompatUtils;
import com.android.contacts.list.ContactsRequest;
import com.android.contacts.list.ContactsRequest;
import com.android.contacts.util.MaterialColorMapUtils;
import com.android.contacts.util.MaterialColorMapUtils;
@@ -507,8 +507,8 @@ public class ActionBarAdapter implements OnCloseListener {
            if (shouldAnimate) {
            if (shouldAnimate) {
                runStatusBarAnimation(/* colorTo */
                runStatusBarAnimation(/* colorTo */
                        MaterialColorMapUtils.getStatusBarColor(mActivity));
                        MaterialColorMapUtils.getStatusBarColor(mActivity));
            } else if (mActivity instanceof ContactsDrawerActivity) {
            } else if (mActivity instanceof PeopleActivity) {
                ((ContactsDrawerActivity) mActivity).updateStatusBarBackground();
                ((PeopleActivity) mActivity).updateStatusBarBackground();
            }
            }
        }
        }
    }
    }
+704 −72

File changed.

Preview size limit exceeded, changes collapsed.

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,11 +49,11 @@ import android.widget.LinearLayout;
import android.widget.Toast;
import android.widget.Toast;


import com.android.contacts.ContactSaveService;
import com.android.contacts.ContactSaveService;
import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.ContactsUtils;
import com.android.contacts.ContactsUtils;
import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.GroupMetaDataLoader;
import com.android.contacts.R;
import com.android.contacts.R;
import com.android.contacts.activities.ActionBarAdapter;
import com.android.contacts.activities.ActionBarAdapter;
import com.android.contacts.activities.PeopleActivity;
import com.android.contacts.group.GroupMembersAdapter.GroupMembersQuery;
import com.android.contacts.group.GroupMembersAdapter.GroupMembersQuery;
import com.android.contacts.interactions.GroupDeletionDialogFragment;
import com.android.contacts.interactions.GroupDeletionDialogFragment;
import com.android.contacts.list.ContactsRequest;
import com.android.contacts.list.ContactsRequest;
@@ -220,7 +220,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM


    private ActionBarAdapter mActionBarAdapter;
    private ActionBarAdapter mActionBarAdapter;


    private ContactsDrawerActivity mActivity;
    private PeopleActivity mActivity;


    private Uri mGroupUri;
    private Uri mGroupUri;


@@ -614,7 +614,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM
    @Override
    @Override
    public void onActivityCreated(Bundle savedInstanceState) {
    public void onActivityCreated(Bundle savedInstanceState) {
        super.onActivityCreated(savedInstanceState);
        super.onActivityCreated(savedInstanceState);
        mActivity = (ContactsDrawerActivity) getActivity();
        mActivity = (PeopleActivity) getActivity();
        mActionBarAdapter = new ActionBarAdapter(mActivity, mActionBarListener,
        mActionBarAdapter = new ActionBarAdapter(mActivity, mActionBarListener,
                mActivity.getSupportActionBar(), mActivity.getToolbar(),
                mActivity.getSupportActionBar(), mActivity.getToolbar(),
                        R.string.enter_contact_name);
                        R.string.enter_contact_name);
+2 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,8 @@ import android.content.DialogInterface;
import android.os.Bundle;
import android.os.Bundle;


import com.android.contacts.ContactSaveService;
import com.android.contacts.ContactSaveService;
import com.android.contacts.ContactsDrawerActivity;
import com.android.contacts.R;
import com.android.contacts.R;
import com.android.contacts.activities.PeopleActivity;


/**
/**
 * A dialog for deleting a group.
 * A dialog for deleting a group.
@@ -65,7 +65,7 @@ public class GroupDeletionDialogFragment extends DialogFragment {


    protected void deleteGroup() {
    protected void deleteGroup() {
        final long groupId = getArguments().getLong(ARG_GROUP_ID);
        final long groupId = getArguments().getLong(ARG_GROUP_ID);
        final ContactsDrawerActivity activity = ((ContactsDrawerActivity) getActivity());
        final PeopleActivity activity = ((PeopleActivity) getActivity());
        activity.startService(ContactSaveService.createGroupDeletionIntent(
        activity.startService(ContactSaveService.createGroupDeletionIntent(
                getActivity(), groupId));
                getActivity(), groupId));
        activity.switchToAllContacts();
        activity.switchToAllContacts();
Loading