From 0020b6ad8c40f976d18e69ac1d37a1bf94e8b5fb Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Tue, 29 Sep 2009 12:20:39 -0700
Subject: [PATCH] Fix Contacts app so that it is able to use import feature!!!

---
 src/com/android/contacts/ContactsListActivity.java      |  5 ++++-
 src/com/android/contacts/util/AccountSelectionUtil.java | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index fac461f..6d2ea57 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -86,7 +86,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
@@ -830,6 +829,10 @@ public class ContactsListActivity extends ListActivity implements
     @Override
     protected Dialog onCreateDialog(int id) {
         switch (id) {
+            case R.string.import_from_sim:
+            case R.string.import_from_sdcard: {
+                return AccountSelectionUtil.getSelectAccountDialog(this, id);
+            }
             case R.id.dialog_sdcard_not_found: {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this)
                 .setTitle(R.string.no_sdcard_title)
diff --git a/src/com/android/contacts/util/AccountSelectionUtil.java b/src/com/android/contacts/util/AccountSelectionUtil.java
index 86c04eb..cf83581 100644
--- a/src/com/android/contacts/util/AccountSelectionUtil.java
+++ b/src/com/android/contacts/util/AccountSelectionUtil.java
@@ -24,6 +24,7 @@ import com.android.contacts.model.Sources;
 
 import android.accounts.Account;
 import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -70,11 +71,11 @@ public class AccountSelectionUtil {
         }
     }
 
-    public static void displaySelectAccountDialog(Context context, int resId) {
-        displaySelectAccountDialog(context, resId, null);
+    public static Dialog getSelectAccountDialog(Context context, int resId) {
+        return getSelectAccountDialog(context, resId, null);
     }
 
-    public static void displaySelectAccountDialog(Context context, int resId,
+    public static Dialog getSelectAccountDialog(Context context, int resId,
             DialogInterface.OnCancelListener onCancelListener) {
         final Sources sources = Sources.getInstance(context);
         final List<Account> writableAccountList = sources.getAccounts(true);
@@ -119,11 +120,11 @@ public class AccountSelectionUtil {
 
         AccountSelectedListener accountSelectedListener =
             new AccountSelectedListener(context, writableAccountList, resId);
-        new AlertDialog.Builder(context)
+        return new AlertDialog.Builder(context)
             .setTitle(R.string.dialog_new_contact_account)
             .setSingleChoiceItems(accountAdapter, 0, accountSelectedListener)
             .setOnCancelListener(accountSelectedListener)
-            .show();
+            .create();
     }
 
     public static void doImport(Context context, int resId, Account account) {
-- 
2.11.0