commit 7806eded62dc5946bea3aa7edfcfd2b19ba30ea2
author Wenyi Wang <wenyiw@google.com> Fri Nov 06 00:57:48 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 06 00:57:48 2015 +0000
tree 3585a07417c1ca5b2f9dbfc39ea23b65e284692f
parent c9b000d1a29d8bfa4cc1aa945f740a98f2869565
parent 2bac9401f5020cc726bef6ea301a85116db41c6e

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

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

diff --git a/src/com/android/contacts/activities/ContactEditorBaseActivity.java b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
index d19f467..383ae64 100644
--- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
@@ -67,8 +67,6 @@
     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 @@
 
         @Override
         public void onContactSplit(Uri newLookupUri) {
-            setResult(RESULT_SPLIT_COMPLETED, /* data */ null);
             finish();
         }
 

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

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 5d5edd9..b838b6b 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -100,7 +100,6 @@
 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 @@
                 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);