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

Commit 6019b387 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

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

Merge "Revert "Reload QuickContact after unlinking to remove stale badges"" into ub-contactsdialer-a-dev
am: 7806eded

* commit '7806eded':
  Revert "Reload QuickContact after unlinking to remove stale badges"
parents d4ee6a9b 7806eded

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

+0 −3
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ 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;



    /**
@@ -307,7 +305,6 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 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;
@@ -1108,11 +1107,6 @@ 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);