Show "Link" item when applicable and show correct toast for deletion.
b/25165853 is about the "Link" item. And this CL also does the following
things:
1. show toast for deleting 1/multiple contacts from PeopleActivity.
2. show toast when deletion happens in QuickContact and contact editor.
Bug: 25165853
Change-Id: Ia8ecb6b4118ecff3bc3ba50ac98ffadf337db52c
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index 1989606..fd117a4 100755
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -1012,7 +1012,15 @@
final Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
getContentResolver().delete(contactUri, null, null);
}
- showToast(R.string.contacts_deleted_toast);
+ final String deleteToastMessage = getResources().getQuantityString(R.plurals
+ .contacts_deleted_toast, contactIds.length);
+ mMainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ Toast.makeText(ContactSaveService.this, deleteToastMessage, Toast.LENGTH_LONG)
+ .show();
+ }
+ });
}
/**
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index d7c074e..2debf77 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1124,8 +1124,9 @@
&& mAllFragment.getSelectedContactIds().size() != 0;
makeMenuItemVisible(menu, R.id.menu_share, showSelectedContactOptions);
makeMenuItemVisible(menu, R.id.menu_delete, showSelectedContactOptions);
- makeMenuItemVisible(menu, R.id.menu_join, showSelectedContactOptions);
- makeMenuItemEnabled(menu, R.id.menu_join, mAllFragment.getSelectedContactIds().size() > 1);
+ final boolean showLinkContactsOptions = mActionBarAdapter.isSelectionMode()
+ && mAllFragment.getSelectedContactIds().size() > 1;
+ makeMenuItemVisible(menu, R.id.menu_join, showLinkContactsOptions);
// Debug options need to be visible even in search mode.
makeMenuItemVisible(menu, R.id.export_database, mEnableDebugMenuOptions);
diff --git a/src/com/android/contacts/interactions/ContactDeletionInteraction.java b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
index a626ad0..5855788 100644
--- a/src/com/android/contacts/interactions/ContactDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactDeletionInteraction.java
@@ -34,6 +34,7 @@
import android.provider.ContactsContract.Contacts.Entity;
import android.text.TextUtils;
import android.util.Log;
+import android.widget.Toast;
import com.android.contacts.ContactSaveService;
import com.android.contacts.R;
@@ -333,6 +334,9 @@
if (isAdded() && mFinishActivityWhenDone) {
getActivity().setResult(RESULT_CODE_DELETED);
getActivity().finish();
+ final String deleteToastMessage = getResources().getQuantityString(R.plurals
+ .contacts_deleted_toast, /* quantity */ 1);
+ Toast.makeText(mContext, deleteToastMessage, Toast.LENGTH_LONG).show();
}
}
}