Make OnCancelListener call finish() in stead of just calling dismiss().
Bug: 2578627
Change-Id: I71e4f318710c60958240cebb35b4a1a065638e32
diff --git a/src/com/android/contacts/ImportVCardActivity.java b/src/com/android/contacts/ImportVCardActivity.java
index dcd0b74..0a324fe 100644
--- a/src/com/android/contacts/ImportVCardActivity.java
+++ b/src/com/android/contacts/ImportVCardActivity.java
@@ -803,7 +803,8 @@
"mAccountSelectionListener must not be null.");
}
return AccountSelectionUtil.getSelectAccountDialog(this, resId,
- mAccountSelectionListener);
+ mAccountSelectionListener,
+ new CancelListener());
}
case R.id.dialog_searching_vcard: {
if (mProgressDialogForScanVCard == null) {
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 3618fad..cc46d2b 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -82,6 +82,10 @@
return getSelectAccountDialog(context, resId, onClickListener, null);
}
+ /**
+ * When OnClickListener or OnCancelListener is null, uses a default listener.
+ * The default OnCancelListener just closes itself with {@link Dialog#dismiss()}.
+ */
public static Dialog getSelectAccountDialog(Context context, int resId,
DialogInterface.OnClickListener onClickListener,
DialogInterface.OnCancelListener onCancelListener) {