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

Commit 3e9a6244 authored by Walter Jang's avatar Walter Jang
Browse files

Move suggest joins popup & activiy to BaseEditContactFragment

Bug 19124091

Change-Id: Ic5a6b8b6359dc9691cfcac2348ba895c542d05d9
parent 1eb21f12
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
@@ -75,25 +75,4 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment
        onSaveCompleted(/* hadChanges =*/ false, SaveMode.RELOAD,
                /* saveSucceeded =*/ uri != null, uri);
    }

    @Override
    public void onSaveCompleted(boolean hadChanges, int saveMode, boolean saveSucceeded,
            Uri contactLookupUri) {
        switch (saveMode) {
            case SaveMode.CLOSE:
            case SaveMode.HOME:
                if (mListener != null) {
                    final Intent resultIntent;
                    if (saveSucceeded && contactLookupUri != null) {
                        final Uri lookupUri = maybeConvertToLegacyLookupUri(
                                mContext, contactLookupUri, mLookupUri);
                        resultIntent = composeQuickContactsIntent(mContext, lookupUri);
                    } else {
                        resultIntent = null;
                    }
                    mListener.onSaveFinished(resultIntent);
                }
                break;
        }
    }
}
+393 −5

File changed.

Preview size limit exceeded, changes collapsed.

+2 −450

File changed.

Preview size limit exceeded, changes collapsed.

+61 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2015 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License
 */

package com.android.contacts.editor;

import com.android.contacts.R;

import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.os.Bundle;

public class JoinSuggestedContactDialogFragment extends DialogFragment {

    private static final String ARG_RAW_CONTACT_IDS = "rawContactIds";

    public static void show(ContactEditorBaseFragment fragment, long[] rawContactIds) {
        final Bundle args = new Bundle();
        args.putLongArray(ARG_RAW_CONTACT_IDS, rawContactIds);

        final JoinSuggestedContactDialogFragment dialog = new JoinSuggestedContactDialogFragment();
        dialog.setArguments(args);
        dialog.setTargetFragment(fragment, 0);
        dialog.show(fragment.getFragmentManager(), "join");
    }

    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        return new AlertDialog.Builder(getActivity())
                .setIconAttribute(android.R.attr.alertDialogIcon)
                .setMessage(R.string.aggregation_suggestion_join_dialog_message)
                .setPositiveButton(android.R.string.yes,
                        new DialogInterface.OnClickListener() {
                            @Override
                            public void onClick(DialogInterface dialog, int whichButton) {
                                ContactEditorFragment targetFragment =
                                        (ContactEditorFragment) getTargetFragment();
                                long rawContactIds[] =
                                        getArguments().getLongArray(ARG_RAW_CONTACT_IDS);
                                targetFragment.doJoinSuggestedContact(rawContactIds);
                            }
                        }
                )
                .setNegativeButton(android.R.string.no, null)
                .create();
    }
}
 No newline at end of file
+63 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2015 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License
 */

package com.android.contacts.editor;

import com.android.contacts.R;

import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.net.Uri;
import android.os.Bundle;

public class SuggestionEditConfirmationDialogFragment extends DialogFragment {

    private static final String ARG_CONTACT_URI = "contactUri";

    public static void show(ContactEditorBaseFragment fragment, Uri contactUri) {
        final Bundle args = new Bundle();
        args.putParcelable(ARG_CONTACT_URI, contactUri);

        final SuggestionEditConfirmationDialogFragment dialog = new
                SuggestionEditConfirmationDialogFragment();
        dialog.setArguments(args);
        dialog.setTargetFragment(fragment, 0);
        dialog.show(fragment.getFragmentManager(), "edit");
    }

    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        return new AlertDialog.Builder(getActivity())
                .setIconAttribute(android.R.attr.alertDialogIcon)
                .setMessage(R.string.aggregation_suggestion_edit_dialog_message)
                .setPositiveButton(android.R.string.yes,
                        new DialogInterface.OnClickListener() {
                            @Override
                            public void onClick(DialogInterface dialog, int whichButton) {
                                final ContactEditorFragment targetFragment =
                                        (ContactEditorFragment) getTargetFragment();
                                final Uri contactUri =
                                        getArguments().getParcelable(ARG_CONTACT_URI);
                                targetFragment.doEditSuggestedContact(contactUri);
                            }
                        }
                )
                .setNegativeButton(android.R.string.no, null)
                .create();
    }
}