Contacts: always request what type of account to use

Always prompt the user when there is more than one account available on
the system (not counting local). In turn, this also always enables the
multi account drop down, if there is more than one account, in the
account creation fragment.

Change-Id: Id3c0ff42309fe71bcac68f3a96ddfa114585e1e2
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 3 insertions, 14 deletions

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 201f2f2ef..547443370 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -645,20 +645,9 @@ public class ContactEditorFragment extends Fragment implements
 
         // If there is no default account or the accounts have changed such that we need to
         // prompt the user again, then launch the account prompt.
-        if (mEditorUtils.shouldShowAccountChangedNotification()) {
-            Intent intent = new Intent(mContext, ContactEditorAccountsChangedActivity.class);
-            mStatus = Status.SUB_ACTIVITY;
-            startActivityForResult(intent, REQUEST_CODE_ACCOUNTS_CHANGED);
-        } else {
-            // Otherwise, there should be a default account. Then either create a local contact
-            // (if default account is null) or create a contact with the specified account.
-            AccountWithDataSet defaultAccount = mEditorUtils.getDefaultAccount();
-            if (defaultAccount == null) {
-                createContact(null);
-            } else {
-                createContact(defaultAccount);
-            }
-        }
+        Intent intent = new Intent(mContext, ContactEditorAccountsChangedActivity.class);
+        mStatus = Status.SUB_ACTIVITY;
+        startActivityForResult(intent, REQUEST_CODE_ACCOUNTS_CHANGED);
     }
 
     /**