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

Commit 0c19fe08 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Merge "Reload QuickContact after unlinking to remove stale badges" into... 

Merge "Reload QuickContact after unlinking to remove stale badges" into ub-contactsdialer-a-dev am: 3f3621bd
am: a72bf91d

* commit 'a72bf91d':
  Reload QuickContact after unlinking to remove stale badges
parents 1357b859 a72bf91d

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_SPLIT_COMPLETED = 2;



    protected int mActionBarTitleResId;



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


        @Override

        public void onContactSplit(Uri newLookupUri) {

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

            finish();

        }

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

+6 −0
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;
@@ -1107,6 +1108,11 @@ public class QuickContactActivity extends ContactsActivity 
                resultCode == ContactDeletionInteraction.RESULT_CODE_DELETED) {

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

            finish();

        } else if (requestCode == REQUEST_CODE_CONTACT_EDITOR_ACTIVITY &&

                resultCode == ContactEditorBaseActivity.RESULT_SPLIT_COMPLETED) {

            // The contact that we were showing has been unlinked, and we reload this activity.

            finish();

            startActivity(getIntent());

        } else if (requestCode == REQUEST_CODE_CONTACT_SELECTION_ACTIVITY &&

                resultCode != RESULT_CANCELED) {

            processIntent(data);