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

Commit 250fc169 authored by Gary Mai's avatar Gary Mai
Browse files

Pass an edited result back from the editor if changes were made 

Bug: 28968298
Change-Id: I23658aad6012500535dc6e2ac5198376f0337c2e
parent 242b3a3c

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

+14 −12
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ 


package com.android.contacts.activities;



import android.app.ActionBar;

import android.app.Dialog;

import android.content.ContentValues;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.RawContacts;

import android.util.Log;

import android.view.View;

import android.view.inputmethod.InputMethodManager;



import com.android.contacts.ContactSaveService;

import com.android.contacts.ContactsActivity;

import com.android.contacts.R;
@@ -29,18 +41,6 @@ import com.android.contacts.editor.EditorIntents; 
import com.android.contacts.interactions.ContactDeletionInteraction;

import com.android.contacts.util.DialogManager;



import android.app.ActionBar;

import android.app.Dialog;

import android.content.ContentValues;

import android.content.Intent;

import android.net.Uri;

import android.os.Bundle;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.RawContacts;

import android.util.Log;

import android.view.View;

import android.view.inputmethod.InputMethodManager;



import java.util.ArrayList;



/**
@@ -68,6 +68,8 @@ abstract public class ContactEditorBaseActivity extends ContactsActivity 
    public static final String ACTION_SAVE_COMPLETED = "saveCompleted";



    public static final int RESULT_CODE_SPLIT = 2;

    // 3 used for ContactDeletionInteraction.RESULT_CODE_DELETED

    public static final int RESULT_CODE_EDITED = 4;



    protected int mActionBarTitleResId;

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

+29 −29
Original line number Diff line number Diff line
@@ -16,35 +16,6 @@ 


package com.android.contacts.editor;



import com.android.contacts.common.logging.ScreenEvent.ScreenType;

import com.google.common.collect.ImmutableList;

import com.google.common.collect.Lists;



import com.android.contacts.ContactSaveService;

import com.android.contacts.GroupMetaDataLoader;

import com.android.contacts.R;

import com.android.contacts.activities.ContactEditorAccountsChangedActivity;

import com.android.contacts.activities.ContactEditorBaseActivity;

import com.android.contacts.activities.ContactEditorBaseActivity.ContactEditor;

import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.model.Contact;

import com.android.contacts.common.model.ContactLoader;

import com.android.contacts.common.model.RawContact;

import com.android.contacts.common.model.RawContactDelta;

import com.android.contacts.common.model.RawContactDeltaList;

import com.android.contacts.common.model.RawContactModifier;

import com.android.contacts.common.model.ValuesDelta;

import com.android.contacts.common.model.account.AccountType;

import com.android.contacts.common.model.account.AccountWithDataSet;

import com.android.contacts.common.util.ImplicitIntentsUtil;

import com.android.contacts.common.util.MaterialColorMapUtils;

import com.android.contacts.editor.AggregationSuggestionEngine.Suggestion;

import com.android.contacts.list.UiIntentActions;

import com.android.contacts.quickcontact.QuickContactActivity;

import com.android.contacts.util.HelpUtils;

import com.android.contacts.util.PhoneCapabilityTester;

import com.android.contacts.util.UiClosables;



import android.accounts.Account;

import android.app.Activity;

import android.app.Fragment;
@@ -84,6 +55,34 @@ import android.widget.LinearLayout; 
import android.widget.ListPopupWindow;

import android.widget.Toast;



import com.android.contacts.ContactSaveService;

import com.android.contacts.GroupMetaDataLoader;

import com.android.contacts.R;

import com.android.contacts.activities.ContactEditorAccountsChangedActivity;

import com.android.contacts.activities.ContactEditorBaseActivity;

import com.android.contacts.activities.ContactEditorBaseActivity.ContactEditor;

import com.android.contacts.common.logging.ScreenEvent.ScreenType;

import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.model.Contact;

import com.android.contacts.common.model.ContactLoader;

import com.android.contacts.common.model.RawContact;

import com.android.contacts.common.model.RawContactDelta;

import com.android.contacts.common.model.RawContactDeltaList;

import com.android.contacts.common.model.RawContactModifier;

import com.android.contacts.common.model.ValuesDelta;

import com.android.contacts.common.model.account.AccountType;

import com.android.contacts.common.model.account.AccountWithDataSet;

import com.android.contacts.common.util.ImplicitIntentsUtil;

import com.android.contacts.common.util.MaterialColorMapUtils;

import com.android.contacts.editor.AggregationSuggestionEngine.Suggestion;

import com.android.contacts.list.UiIntentActions;

import com.android.contacts.quickcontact.QuickContactActivity;

import com.android.contacts.util.HelpUtils;

import com.android.contacts.util.PhoneCapabilityTester;

import com.android.contacts.util.UiClosables;

import com.google.common.collect.ImmutableList;

import com.google.common.collect.Lists;



import java.util.ArrayList;

import java.util.HashSet;

import java.util.Iterator;
@@ -1472,6 +1471,7 @@ abstract public class ContactEditorBaseFragment extends Fragment implements 
                            QuickContactActivity.MODE_FULLY_EXPANDED);

                    resultIntent.putExtra(QuickContactActivity.EXTRA_PREVIOUS_SCREEN_TYPE,

                            ScreenType.EDITOR);

                    resultIntent.putExtra(QuickContactActivity.EXTRA_CONTACT_EDITED, true);

                } else {

                    resultIntent = null;

                }

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

+6 −0
Original line number Diff line number Diff line
@@ -209,6 +209,9 @@ public class QuickContactActivity extends ContactsActivity 


    /** Used to pass the screen where the user came before launching this Activity. */

    public static final String EXTRA_PREVIOUS_SCREEN_TYPE = "previous_screen_type";

    /** Used to tell the QuickContact that the previous contact was edited, so it can return an

     * activity result back to the original Activity that launched it. */

    public static final String EXTRA_CONTACT_EDITED = "contact_edited";



    private static final String TAG = "QuickContact";
@@ -1209,6 +1212,9 @@ public class QuickContactActivity extends ContactsActivity 
            return;

        }

        Uri lookupUri = intent.getData();

        if (intent.getBooleanExtra(EXTRA_CONTACT_EDITED, false)) {

            setResult(ContactEditorBaseActivity.RESULT_CODE_EDITED);

        }



        // Check to see whether it comes from the old version.

        if (lookupUri != null && LEGACY_AUTHORITY.equals(lookupUri.getAuthority())) {