commit e43354f1caa0913b5b8c7b6bba197792a27806ac
author Wenyi Wang <wenyiw@google.com> Fri Nov 06 17:45:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 06 17:45:43 2015 +0000
tree 29fd7b692ca5876f1a55034978ad7315608237f0
parent d1cb9045bffc3843f5a294d41ce4608c701bcccc
parent a3365007916e09e4d053a4d971c2eac6002153be

Merge "Fix for text and button alignment of suggestion card (in RTL layout)" 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..ffbeb49 100644
--- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
@@ -67,7 +67,7 @@
     public static final String ACTION_JOIN_COMPLETED = "joinCompleted";
     public static final String ACTION_SAVE_COMPLETED = "saveCompleted";
 
-    public static final int RESULT_SPLIT_COMPLETED = 2;
+    public static final int RESULT_CODE_SPLIT = 2;
 
     protected int mActionBarTitleResId;
 
@@ -307,7 +307,7 @@
 
         @Override
         public void onContactSplit(Uri newLookupUri) {
-            setResult(RESULT_SPLIT_COMPLETED, /* data */ null);
+            setResult(RESULT_CODE_SPLIT, /* 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..2d513d8 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1104,15 +1104,11 @@
 
     @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_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);