Merge "Move SelectAccountDialogFragment from common.editor to editor" (4517696d) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ContactsDrawerActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import android.widget.Toast;
		import com.android.contacts.activities.GroupMembersActivity;
		import com.android.contacts.common.ContactsUtils;
		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.editor.SelectAccountDialogFragment;
		import com.android.contacts.common.list.AccountFilterActivity;
		import com.android.contacts.common.list.ContactListFilter;
		import com.android.contacts.common.list.ContactListFilterController;
		@@ -63,6 +62,7 @@ import com.android.contacts.common.util.DeviceAccountPresentationValues;
		import com.android.contacts.common.util.ImplicitIntentsUtil;
		import com.android.contacts.common.util.ViewUtil;
		import com.android.contacts.editor.ContactEditorBaseFragment;
		import com.android.contacts.editor.SelectAccountDialogFragment;
		import com.android.contacts.group.GroupListItem;
		import com.android.contacts.group.GroupMetadata;
		import com.android.contacts.group.GroupNameEditDialogFragment;

src/com/android/contacts/common/interactions/ImportExportDialogFragment.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ import android.widget.Toast;
		import com.android.contacts.common.R;
		import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
		import com.android.contacts.common.editor.SelectAccountDialogFragment;
		import com.android.contacts.common.model.AccountTypeManager;
		import com.android.contacts.common.model.account.AccountWithDataSet;
		import com.android.contacts.common.util.AccountSelectionUtil;
		@@ -53,7 +52,7 @@ import com.android.contacts.common.util.ImplicitIntentsUtil;
		import com.android.contacts.common.vcard.ExportVCardActivity;
		import com.android.contacts.common.vcard.VCardCommonArguments;
		import com.android.contacts.common.vcard.ShareVCardActivity;
		import com.android.contactsbind.analytics.AnalyticsUtil;
		import com.android.contacts.editor.SelectAccountDialogFragment;

		import java.util.List;

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License
		*/

		package com.android.contacts.common.editor;
		package com.android.contacts.editor;

		import android.app.Activity;
		import android.app.AlertDialog;
		@@ -44,9 +44,6 @@ public final class SelectAccountDialogFragment extends DialogFragment {
		private static final String KEY_LIST_FILTER = "list_filter";
		private static final String KEY_EXTRA_ARGS = "extra_args";

		public SelectAccountDialogFragment() { // All fragments must have a public default constructor.
		}

		/**
		* Show the dialog.
		*

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

+0 −42

Original line number	Diff line number	Diff line
		@@ -118,7 +118,6 @@ import com.android.contacts.common.compat.CompatUtils;
		import com.android.contacts.common.compat.EventCompat;
		import com.android.contacts.common.compat.MultiWindowCompat;
		import com.android.contacts.common.dialog.CallSubjectDialog;
		import com.android.contacts.common.editor.SelectAccountDialogFragment;
		import com.android.contacts.common.interactions.TouchPointManager;
		import com.android.contacts.common.lettertiles.LetterTileDrawable;
		import com.android.contacts.common.list.ShortcutIntentBuilder;
		@@ -288,7 +287,6 @@ public class QuickContactActivity extends ContactsActivity
		private String mPermissionExplanationCardSubHeader = "";

		private MultiShrinkScroller mScroller;
		private SelectAccountDialogFragmentListener mSelectAccountFragmentListener;
		private AsyncTask<Void, Void, Cp2DataCardModel> mEntriesAndActionsTask;
		private AsyncTask<Void, Void, Void> mRecentDataTask;

		@@ -775,36 +773,6 @@ public class QuickContactActivity extends ContactsActivity
		}
		}

		/**
		* Headless fragment used to handle account selection callbacks invoked from
		* {@link DirectoryContactUtil}.
		*/
		public static class SelectAccountDialogFragmentListener extends Fragment
		implements SelectAccountDialogFragment.Listener {

		private QuickContactActivity mQuickContactActivity;

		public SelectAccountDialogFragmentListener() {}

		@Override
		public void onAccountChosen(AccountWithDataSet account, Bundle extraArgs) {
		DirectoryContactUtil.createCopy(mQuickContactActivity.mContactData.getContentValues(),
		account, mQuickContactActivity);
		}

		@Override
		public void onAccountSelectorCancelled() {}

		/**
		* Set the parent activity. Since rotation can cause this fragment to be used across
		* more than one activity instance, we need to explicitly set this value instead
		* of making this class non-static.
		*/
		public void setQuickContactActivity(QuickContactActivity quickContactActivity) {
		mQuickContactActivity = quickContactActivity;
		}
		}

		final MultiShrinkScrollerListener mMultiShrinkScrollerListener
		= new MultiShrinkScrollerListener() {
		@Override
		@@ -1119,16 +1087,6 @@ public class QuickContactActivity extends ContactsActivity

		setHeaderNameText(R.string.missing_name);

		mSelectAccountFragmentListener= (SelectAccountDialogFragmentListener) getFragmentManager()
		.findFragmentByTag(FRAGMENT_TAG_SELECT_ACCOUNT);
		if (mSelectAccountFragmentListener == null) {
		mSelectAccountFragmentListener = new SelectAccountDialogFragmentListener();
		getFragmentManager().beginTransaction().add(0, mSelectAccountFragmentListener,
		FRAGMENT_TAG_SELECT_ACCOUNT).commit();
		mSelectAccountFragmentListener.setRetainInstance(true);
		}
		mSelectAccountFragmentListener.setQuickContactActivity(this);

		SchedulingUtils.doOnPreDraw(mScroller, /* drawNextFrame = */ true,
		new Runnable() {
		@Override