Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 756fc240 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Show "Link" item when applicable and show correct toast for deletion."... 

Merge "Show "Link" item when applicable and show correct toast for deletion." into ub-contactsdialer-a-dev
parents 90208111 687d2189

res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -172,8 +172,11 @@ 
    <!-- Toast shown after two contacts have been linked by a user action. [CHAR LIMIT=NONE] -->

    <string name="contactsJoinedMessage">Contacts linked</string>



    <!-- Toast shown after contacts that the user has selected are deleted by a user action. [CHAR LIMIT=NONE] -->

    <string name="contacts_deleted_toast">Contacts deleted</string>

    <!-- Toast shown after contacts that the user has selected are deleted by a user action. [CHAR LIMIT=30] -->

    <plurals name="contacts_deleted_toast">

        <item quantity="one">Contact deleted</item>

        <item quantity="other">Contacts deleted</item>

    </plurals>



    <!-- Menu item that opens the Options activity for a given contact [CHAR LIMIT=15] -->

    <string name="menu_set_ring_tone">Set ringtone</string>

src/com/android/contacts/ContactSaveService.java

+9 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,15 @@ public class ContactSaveService extends IntentService { 
            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();

            }

        });

    }



    /**

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

+3 −2
Original line number Diff line number Diff line
@@ -1125,8 +1125,9 @@ public class PeopleActivity extends ContactsActivity implements 
                && 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 &&

src/com/android/contacts/interactions/ContactDeletionInteraction.java

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.provider.ContactsContract.Contacts; 
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 @@ public class ContactDeletionInteraction extends Fragment 
        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();

        }

    }

}