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

Commit 8d26c0a7 authored by Walter Jang's avatar Walter Jang
Browse files

DO NOT MERGE Revert "Start ContactSheet instead of QuickContacts (1/2)" 

This reverts commit 581585d9.

Test: see I5ad160778d29a78e965fd7cb2ded67b017f4ab9a
Bug: 32604475
Change-Id: If92ea63ed5dbd8d62e3a9f84a8fcd953fa4c9738
parent 7826cb2f

src-bind/com/android/contactsbind/ObjectFactory.java

+0 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ package com.android.contactsbind; 


import android.app.Fragment;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;



import com.android.contacts.logging.Logger;
@@ -38,10 +37,6 @@ public class ObjectFactory { 
        return null;

    }



    public static Intent getContactSheetIntent(Context context, Uri contactLookupUri) {

        return null;

    }



    public static Uri getWelcomeUri() {

        return null;

    }

src/com/android/contacts/Experiments.java

+0 −5
Original line number Diff line number Diff line
@@ -19,11 +19,6 @@ package com.android.contacts; 
 * Experiment flag names.

 */

public final class Experiments {

    /**

     * Whether to open contact sheet (aka smart profile) instead of our own QuickContact.

     */

    public static final String CONTACT_SHEET = "QuickContact__contact_sheet";



    /**

     * Flags for maximum content update time

     */

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

+2 −7
Original line number Diff line number Diff line
@@ -282,13 +282,8 @@ public class ContactEditorActivity extends AppCompatContactsActivity implements 
                    if (mFinishActivityOnSaveCompleted) {

                        setResult(resultIntent == null ? RESULT_CANCELED : RESULT_OK, resultIntent);

                    } else if (resultIntent != null) {

                        // If it's a smart profile Intent it must be started "for result"

                        if (QuickContact.ACTION_QUICK_CONTACT.equals(resultIntent.getAction())) {

                        ImplicitIntentsUtil.startActivityInApp(

                                ContactEditorActivity.this, resultIntent);

                        } else {

                            startActivityForResult(resultIntent, /* requestCode */ 0);

                        }

                    }

                    finish();

                }

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

+5 −12
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import android.widget.ListPopupWindow; 
import android.widget.Toast;



import com.android.contacts.ContactSaveService;

import com.android.contacts.Experiments;

import com.android.contacts.GroupMetaDataLoader;

import com.android.contacts.R;

import com.android.contacts.activities.ContactEditorAccountsChangedActivity;
@@ -89,8 +88,7 @@ import com.android.contacts.util.ImplicitIntentsUtil; 
import com.android.contacts.util.MaterialColorMapUtils;

import com.android.contacts.util.UiClosables;

import com.android.contactsbind.HelpUtils;

import com.android.contactsbind.ObjectFactory;

import com.android.contactsbind.experiments.Flags;



import com.google.common.base.Preconditions;

import com.google.common.collect.ImmutableList;

import com.google.common.collect.Lists;
@@ -1439,18 +1437,13 @@ public class ContactEditorFragment extends Fragment implements 
        }

        switch (saveMode) {

            case SaveMode.CLOSE: {

                Intent resultIntent = null;

                final Intent resultIntent;

                if (saveSucceeded && contactLookupUri != null) {

                    final Uri lookupUri = ContactEditorUtils.maybeConvertToLegacyLookupUri(

                            mContext, contactLookupUri, mLookupUri);

                    if (Flags.getInstance().getBoolean(Experiments.CONTACT_SHEET)) {

                        resultIntent = ObjectFactory.getContactSheetIntent(mContext, lookupUri);

                    }

                    if (resultIntent == null) {

                    resultIntent = ImplicitIntentsUtil.composeQuickContactIntent(

                            mContext, lookupUri, ScreenType.EDITOR);

                    resultIntent.putExtra(QuickContactActivity.EXTRA_CONTACT_EDITED, true);

                    }

                } else {

                    resultIntent = null;

                }

src/com/android/contacts/util/ImplicitIntentsUtil.java

+1 −15
Original line number Diff line number Diff line
@@ -30,12 +30,9 @@ import android.provider.ContactsContract.QuickContact; 
import android.provider.Settings;

import android.text.TextUtils;



import com.android.contacts.Experiments;

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

import com.android.contacts.model.account.GoogleAccountType;

import com.android.contacts.quickcontact.QuickContactActivity;

import com.android.contactsbind.ObjectFactory;

import com.android.contactsbind.experiments.Flags;



import java.util.List;
@@ -118,21 +115,10 @@ public class ImplicitIntentsUtil { 


    private static void startQuickContact(Activity activity, Uri contactLookupUri,

            int previousScreenType, int requestCode) {



        if (Flags.getInstance().getBoolean(Experiments.CONTACT_SHEET)) {

            final Intent intent = ObjectFactory.getContactSheetIntent(activity, contactLookupUri);

            if (intent != null) {

                // We must start ContactSheet "for result" with a requestCode that is >= 0

                // so that ContactSheet can validate that the caller is a 1P app.

                activity.startActivityForResult(intent, requestCode >= 0 ? requestCode : 0);

                return;

            }

        }



        final Intent intent = ImplicitIntentsUtil.composeQuickContactIntent(

                activity, contactLookupUri, previousScreenType);



        // For the non ContactSheet case we only start "for result" if specifically requested.

        // We only start "for result" if specifically requested.

        if (requestCode >= 0) {

            intent.setPackage(activity.getPackageName());

            activity.startActivityForResult(intent, requestCode);