Do not show an extra confirmation step when sharing lots of contacts

Bug:2524537

Change-Id: I55250f1da6208f2f6d16eb3a42ef854fa5396d68

diff --git a/res/values/ids.xml b/res/values/ids.xml
index b8d90c5..ceb10f8 100644 (file)
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -36,7 +36,6 @@
     <item type="id" name="dialog_readonly_contact_hide_confirmation"/>
     <item type="id" name="dialog_multiple_contact_delete_confirmation"/>
     <item type="id" name="dialog_readonly_contact_delete_confirmation"/>
-    <item type="id" name="dialog_share_confirmation" />
 
     <!-- For ExportVCard -->
     <item type="id" name="dialog_export_confirmation"/>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 39a2e18..6a73500 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -747,12 +747,6 @@
     <!-- Dialog message shown when a user confirms whether he/she export Contact data -->
     <string name="confirm_export_message">Are you sure you want to export your contact list to \"<xliff:g id="vcard_filename">%s</xliff:g>\"?</string>
 
-    <!-- Dialog title shown when a user confirms whether he/she does bulk sharing (visible contacts) -->
-    <string name="confirm_share_visible_contacts_title">Confirm bulk sharing</string>
-
-    <!-- Dialog message shown when a user confirms whether he/she really wants to do bulk sharing (via Bluetooth, etc.) (visible contacts) -->
-    <string name="confirm_share_visible_contacts_message">Are you sure you want to share all visible contacts?</string>
-
     <!-- Dialog title shown when exporting Contact data failed -->
     <string name="exporting_contact_failed_title">Failed to export contact data</string>
 

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index fdefe36..d0d6cb2 100644 (file)
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -71,7 +71,6 @@ import android.provider.ContactsContract.ContactCounts;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Intents;
-import android.provider.ContactsContract.Presence;
 import android.provider.ContactsContract.ProviderStatus;
 import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.SearchSnippetColumns;
@@ -1372,20 +1371,6 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
                         .setPositiveButton(android.R.string.ok,
                                 new DeleteClickListener()).create();
             }
-            case R.id.dialog_share_confirmation: {
-                return new AlertDialog.Builder(this)
-                        .setTitle(R.string.confirm_share_visible_contacts_title)
-                        .setMessage(getString(R.string.confirm_share_visible_contacts_message))
-                        .setNegativeButton(android.R.string.cancel, null)
-                        .setPositiveButton(android.R.string.ok,
-                                new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                if (which == DialogInterface.BUTTON_POSITIVE) {
-                                    doShareVisibleContacts();
-                                }
-                            }
-                        }).create();
-            }
         }
         return super.onCreateDialog(id, bundle);
     }
@@ -1449,7 +1434,7 @@ public class ContactsListActivity extends ListActivity implements View.OnCreateC
                         break;
                     }
                     case R.string.share_visible_contacts: {
-                        showDialog(R.id.dialog_share_confirmation);
+                        doShareVisibleContacts();
                         break;
                     }
                     default: {