commit 34646ade6af15ce7cb84a5f5aa1b7cab072e6379
author Daniel Lehmann <lehmannd@google.com> Fri May 20 09:48:32 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 20 09:48:32 2011 -0700
tree 34441a6b366125ba752a84820d31b3895bf5ff0b
parent ce5c3700268034f26fb2aa1784de37d211f9a13d
parent 51e8d634f2d16aeaed73b6fba42d02a1c2d48b20

Merge "Remove an unneeded function and an unused callback function"

src/com/android/contacts/activities/ContactBrowserActivity.java

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index ba72ecc..f6b3f2f 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -168,7 +168,8 @@
         item.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                createNewContact();
+                final Intent intent = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);
+                startActivityForResult(intent, SUBACTIVITY_NEW_CONTACT);
             }
         });
 
@@ -760,18 +761,6 @@
         return false;
     }
 
-    private void createNewContact() {
-        // We have an account switcher in "create-account" screen, so don't need to ask a user to
-        // select an account here.
-        final ArrayList<Account> accounts =
-                AccountTypeManager.getInstance(this).getAccounts(true);
-        final Intent intent = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);
-        if (accounts.size() > 0) {
-            intent.putExtra(Intents.Insert.ACCOUNT, accounts.get(0));
-        }
-        startActivityForResult(intent, SUBACTIVITY_NEW_CONTACT);
-    }
-
     @Override
     public void startSearch(String initialQuery, boolean selectInitialQuery, Bundle appSearchData,
             boolean globalSearch) {

src/com/android/contacts/activities/ContactEditorActivity.java

diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index cedde4e..29ebd59 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -170,11 +170,6 @@
         }
 
         @Override
-        public void onAccountSelectorAborted() {
-            finish();
-        }
-
-        @Override
         public void onContactNotFound() {
             setResult(Activity.RESULT_CANCELED, null);
             finish();

src/com/android/contacts/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index eb28259..96d5843 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1058,11 +1058,6 @@
         void onContactSplit(Uri newLookupUri);
 
         /**
-         * User was presented with an account selection and couldn't decide.
-         */
-        void onAccountSelectorAborted();
-
-        /**
          * User has tapped Revert, close the fragment now.
          */
         void onReverted();