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

Commit 740bc93c authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Make Contact app works can open work contacts" into ub-contactsdialer-b-dev

parents d5d6a763 ed5202a2

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

+12 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.preference.PreferenceActivity; 
import android.provider.ContactsContract;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.ProviderStatus;

import android.provider.ContactsContract.QuickContact;

import android.provider.Settings;

import android.support.v13.app.FragmentPagerAdapter;

import android.support.v4.view.PagerAdapter;
@@ -955,11 +956,18 @@ public class PeopleActivity extends ContactsActivity implements 
        }



        @Override

        public void onViewContactAction(Uri contactLookupUri) {

            final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(contactLookupUri,

        public void onViewContactAction(Uri contactLookupUri, boolean isEnterpriseContact) {

            if (isEnterpriseContact) {

                // No implicit intent as user may have a different contacts app in work profile.

                QuickContact.showQuickContact(PeopleActivity.this, new Rect(), contactLookupUri,

                        QuickContactActivity.MODE_FULLY_EXPANDED, null);

            } else {

                final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

                        contactLookupUri,

                        QuickContactActivity.MODE_FULLY_EXPANDED);

                ImplicitIntentsUtil.startActivityInApp(PeopleActivity.this, intent);

            }

        }



        @Override

        public void onDeleteContactAction(Uri contactUri) {

src/com/android/contacts/list/ContactBrowseListFragment.java

+2 −2
Original line number Diff line number Diff line
@@ -600,9 +600,9 @@ public abstract class ContactBrowseListFragment extends 
        mListener = listener;

    }



    public void viewContact(Uri contactUri) {

    public void viewContact(Uri contactUri, boolean isEnterpriseContact) {

        setSelectedContactUri(contactUri, false, false, true, false);

        if (mListener != null) mListener.onViewContactAction(contactUri);

        if (mListener != null) mListener.onViewContactAction(contactUri, isEnterpriseContact);

    }



    public void deleteContact(Uri contactUri) {

src/com/android/contacts/list/DefaultContactBrowseListFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment 
        if (uri == null) {

            return;

        }

        viewContact(uri);

        viewContact(uri, getAdapter().isEnterpriseContact(position));

    }



    @Override

src/com/android/contacts/list/OnContactBrowserActionListener.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public interface OnContactBrowserActionListener { 
     *

     * @param contactLookupUri The lookup-uri of the Contact that should be opened

     */

    void onViewContactAction(Uri contactLookupUri);

    void onViewContactAction(Uri contactLookupUri, boolean isEnterpriseContact);



    /**

     * Initiates the contact deletion process.