commit 982684009d0adce08c02b14af16cb44d7ee615e1
author Tingting Wang <tingtingw@google.com> Wed Oct 14 19:00:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 14 19:00:10 2015 +0000
tree 90fab94998ba6a306346f1fd07d365ddfe57a204
parent 838d2bab64b4bd29f8e956100c01909d08cc6279
parent 5585c6ef5e8f075bdc3d514887322c6fa683f4cb

Merge "Use the terms "Link and Unlink" instead of "Merge and separate"." into ub-contactsdialer-a-dev

src/com/android/contacts/editor/CompactContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index 058a66c..6e4c4be 100644
--- a/src/com/android/contacts/editor/CompactContactEditorFragment.java
+++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java
@@ -82,16 +82,6 @@
     }
 
     @Override
-    public void onStop() {
-        super.onStop();
-
-        // If anything was left unsaved, save it now
-        if (!getActivity().isChangingConfigurations() && mStatus == Status.EDITING) {
-            save(SaveMode.RELOAD);
-        }
-    }
-
-    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {
             return revert();

src/com/android/contacts/editor/ContactEditorBaseFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index 9ae81f6..718128b 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -643,13 +643,7 @@
     @Override
     public void onStop() {
         super.onStop();
-
         UiClosables.closeQuietly(mAggregationSuggestionPopup);
-
-        // If anything was left unsaved, save it now but keep the editor open.
-        if (!getActivity().isChangingConfigurations() && mStatus == Status.EDITING) {
-            save(SaveMode.RELOAD);
-        }
     }
 
     @Override