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

Commit 917cb4aa authored by Wenyi Wang's avatar Wenyi Wang
Browse files

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

- Created by cherry-picking Ia67586501836af6a8bef633c682480d94e2c1869
  and resolving conflicts so as to reduce merge conflict to master-dev.
- Downgraded visibility of many methods and variables to private.
- Rename mAllFragment as mContactsListFragment

Bug: 34066506

Test: quick sanity test

Change-Id: I13b20b078a42de50c69bee2b3abc97c72335c607
parent d8617d35

src/com/android/contacts/ContactsDrawerActivity.java

deleted100644 → 0
+0 −720

File deleted.

Preview size limit exceeded, changes collapsed.

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

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

import android.widget.TextView;



import com.android.contacts.ContactsDrawerActivity;

import com.android.contacts.R;

import com.android.contacts.activities.ActionBarAdapter.Listener.Action;

import com.android.contacts.activities.PeopleActivity;

import com.android.contacts.compat.CompatUtils;

import com.android.contacts.list.ContactsRequest;

import com.android.contacts.util.MaterialColorMapUtils;
@@ -507,8 +507,8 @@ public class ActionBarAdapter implements OnCloseListener { 
            if (shouldAnimate) {

                runStatusBarAnimation(/* colorTo */

                        MaterialColorMapUtils.getStatusBarColor(mActivity));

            } else if (mActivity instanceof ContactsDrawerActivity) {

                ((ContactsDrawerActivity) mActivity).updateStatusBarBackground();

            } else if (mActivity instanceof PeopleActivity) {

                ((PeopleActivity) mActivity).updateStatusBarBackground();

            }

        }

    }

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

+712 −59

File changed.

Preview size limit exceeded, changes collapsed.

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

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



import com.android.contacts.ContactSaveService;

import com.android.contacts.ContactsDrawerActivity;

import com.android.contacts.ContactsUtils;

import com.android.contacts.GroupMetaDataLoader;

import com.android.contacts.R;

import com.android.contacts.activities.ActionBarAdapter;

import com.android.contacts.activities.PeopleActivity;

import com.android.contacts.group.GroupMembersAdapter.GroupMembersQuery;

import com.android.contacts.interactions.GroupDeletionDialogFragment;

import com.android.contacts.list.ContactsRequest;
@@ -220,7 +220,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM 


    private ActionBarAdapter mActionBarAdapter;



    private ContactsDrawerActivity mActivity;

    private PeopleActivity mActivity;



    private Uri mGroupUri;
@@ -614,7 +614,7 @@ public class GroupMembersFragment extends MultiSelectContactsListFragment<GroupM 
    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        mActivity = (ContactsDrawerActivity) getActivity();

        mActivity = (PeopleActivity) getActivity();

        mActionBarAdapter = new ActionBarAdapter(mActivity, mActionBarListener,

                mActivity.getSupportActionBar(), mActivity.getToolbar(),

                        R.string.enter_contact_name);

src/com/android/contacts/interactions/GroupDeletionDialogFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.content.DialogInterface; 
import android.os.Bundle;



import com.android.contacts.ContactSaveService;

import com.android.contacts.ContactsDrawerActivity;

import com.android.contacts.R;

import com.android.contacts.activities.PeopleActivity;



/**

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


    protected void deleteGroup() {

        final long groupId = getArguments().getLong(ARG_GROUP_ID);

        final ContactsDrawerActivity activity = ((ContactsDrawerActivity) getActivity());

        final PeopleActivity activity = ((PeopleActivity) getActivity());

        activity.startService(ContactSaveService.createGroupDeletionIntent(

                getActivity(), groupId));

        activity.switchToAllContacts();