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

Commit 23a3035c authored by Sean Liu's avatar Sean Liu Committed by Android (Google) Code Review
Browse files

Merge "Bringing Choose account dialog up to spec" into ub-contactsdialer-f-dev

parents a5be4d7c d0b4e6c1

src/com/android/contacts/common/editor/SelectAccountDialogFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.app.Fragment; 
import android.app.FragmentManager;

import android.content.DialogInterface;

import android.os.Bundle;

import android.view.View;

import android.widget.TextView;



import com.android.contacts.common.R;

import com.android.contacts.common.model.account.AccountWithDataSet;
@@ -99,7 +101,9 @@ public final class SelectAccountDialogFragment extends DialogFragment { 
            }

        };



        builder.setTitle(args.getInt(KEY_TITLE_RES_ID));

        final TextView title = (TextView) View.inflate(getActivity(), R.layout.dialog_title, null);

        title.setText(args.getInt(KEY_TITLE_RES_ID));

        builder.setCustomTitle(title);

        builder.setSingleChoiceItems(accountAdapter, 0, clickListener);

        final AlertDialog result = builder.create();

        return result;

src/com/android/contacts/common/util/AccountSelectionUtil.java

+8 −5
Original line number Diff line number Diff line
@@ -151,11 +151,14 @@ public class AccountSelectionUtil { 
                }

            };

        }

        return new AlertDialog.Builder(context)

            .setTitle(R.string.dialog_new_contact_account)

            .setSingleChoiceItems(accountAdapter, 0, onClickListener)

            .setOnCancelListener(onCancelListener)

            .create();

        final AlertDialog.Builder builder = new AlertDialog.Builder(context);

        final TextView title = (TextView) View.inflate(context, R.layout.dialog_title, null);

        title.setText(R.string.dialog_new_contact_account);

        builder.setCustomTitle(title);

        builder.setSingleChoiceItems(accountAdapter, 0, onClickListener);

        builder.setOnCancelListener(onCancelListener);

        final AlertDialog result = builder.create();

        return result;

    }



    public static void doImport(Context context, int resId, AccountWithDataSet account,