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

Commit 022a974e authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Close QuickContact after unlinking contact from editor 

am: d1cb9045

* commit 'd1cb9045':
  Close QuickContact after unlinking contact from editor
parents 6019b387 d1cb9045

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

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ abstract public class ContactEditorBaseActivity extends ContactsActivity 
    public static final String ACTION_JOIN_COMPLETED = "joinCompleted";

    public static final String ACTION_SAVE_COMPLETED = "saveCompleted";



    public static final int RESULT_CODE_SPLIT = 2;



    protected int mActionBarTitleResId;



    /**
@@ -305,6 +307,7 @@ abstract public class ContactEditorBaseActivity extends ContactsActivity 


        @Override

        public void onContactSplit(Uri newLookupUri) {

            setResult(RESULT_CODE_SPLIT, /* data */ null);

            finish();

        }

src/com/android/contacts/quickcontact/QuickContactActivity.java

+5 −3
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import com.android.contacts.ContactSaveService; 
import com.android.contacts.ContactsActivity;

import com.android.contacts.NfcHandler;

import com.android.contacts.R;

import com.android.contacts.activities.ContactEditorBaseActivity;

import com.android.contacts.common.CallUtil;

import com.android.contacts.common.ClipboardUtils;

import com.android.contacts.common.Collapser;
@@ -1103,9 +1104,10 @@ public class QuickContactActivity extends ContactsActivity 


    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == REQUEST_CODE_CONTACT_EDITOR_ACTIVITY &&

                resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED) {

            // The contact that we were showing has been deleted.

        final boolean deletedOrSplit = requestCode == REQUEST_CODE_CONTACT_EDITOR_ACTIVITY &&

                (resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED ||

                resultCode == ContactEditorBaseActivity.RESULT_CODE_SPLIT);

        if (deletedOrSplit) {

            finish();

        } else if (requestCode == REQUEST_CODE_CONTACT_SELECTION_ACTIVITY &&

                resultCode != RESULT_CANCELED) {