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

Commit 168331d8 authored by Tingting Wang's avatar Tingting Wang
Browse files

String changes to Contacts App (2/2). 

1) Suggestion card help message.
2) Delete confirmation dialog.
3) Link, unlink and discard confirmation dialog.
4) All Contacts tab.
5) Place on home screen.
6) Default account dialog text.

BUG 25386765

Change-Id: I79a31ee143f38868d92c4d6f0379694462f595fb
parent 0d9c24b7

res/values/strings.xml

+42 −18
Original line number Diff line number Diff line
@@ -145,16 +145,25 @@ 
    <string name="splitConfirmation_title">Unlink contact?</string>



    <!-- Confirmation dialog for unlinking contacts into multiple instances [CHAR LIMIT=NONE] -->

    <string name="splitConfirmation">This contact will be unlinked into multiple contacts.</string>

    <string name="splitConfirmation">Unlink this contact into multiple contacts?</string>



    <!-- Positive button text from the confirmation dialog for unlinking contacts [CHAR LIMIT = 30] -->

    <string name="splitConfirmation_positive_button">Unlink</string>



    <!-- Confirmation dialog for unlinking contacts into multiple instances when there are also unsaved changes for the current contact. [CHAR LIMIT=NONE] -->

    <string name="splitConfirmationWithPendingChanges">There are unsaved changes. Do you want to save them before unlinking this contact into multiple contacts?</string>

    <string name="splitConfirmationWithPendingChanges">Would you like to save the changes you already made and unlink this contact into multiple contacts?</string>



    <!-- Positive button text from the confirmation dialog for unlinking contacts with pending changes [CHAR LIMIT = 60] -->

    <string name="splitConfirmationWithPendingChanges_positive_button">Save and Unlink</string>



    <!-- Title of the confirmation dialog for joining contacts when there are unsaved changes. [CHAR LIMIT=40] -->

    <string name="joinConfirmation_title">Link contact?</string>



    <!-- Confirmation dialog message for joining contacts when there are unsaved changes. [CHAR LIMIT=NONE] -->

    <string name="joinConfirmation">There are unsaved changes. Do you want to save them before linking?</string>

    <string name="joinConfirmation">Would you like to save the changes you already made and link with the contact selected?</string>



    <!-- Positive button text from the confirmation dialog for joining contacts when there are unsaved changes. [CHAR LIMIT = 60] -->

    <string name="joinConfirmation_positive_button">Save and Link</string>



    <!-- Menu item that links an aggregate with another aggregate -->

    <string name="menu_joinAggregate">Link</string>
@@ -194,31 +203,40 @@ 
    <string name="menu_redirect_calls_to_vm">All calls to voicemail</string>



    <!-- Warning dialog contents after users selects to delete a ReadOnly contact. [CHAR LIMIT=NONE] -->

    <string name="readOnlyContactWarning">You can\'t delete contacts from read-only accounts, but you can hide them in your contacts lists.</string>

    <string name="readOnlyContactWarning">Contacts from your read-only accounts will be hidden on this device, not deleted.</string>



    <!-- Warning dialog contents after users selects to delete a contact with ReadOnly and Writable sources. -->

    <string name="readOnlyContactDeleteConfirmation">This contact contains information from multiple accounts. Information from read-only accounts will be hidden in your contacts lists, not deleted.</string>

    <string name="readOnlyContactDeleteConfirmation">This contact has details from multiple accounts. Details from read-only accounts will be hidden on this device, not deleted.</string>



    <!-- Warning dialog. Shown if user selects a single contact to link. [CHAR LIMIT=NONE]  -->

    <string name="batch_link_single_contact_warning">You need at least two contacts selected to perform a link.</string>



    <!-- Confirmation dialog. Shown after user selects to link contacts. [CHAR LIMIT=NONE]  -->

    <string name="batch_link_confirmation">The selected contacts will be linked into a single contact.</string>

    <string name="batch_link_confirmation">Link selected contacts?</string>



    <!-- Positive button text from confirmation dialog. Shown after user selects to link contacts. [CHAR LIMIT=40]  -->

    <string name="batch_link_confirmation_positive_button">Link</string>



    <!-- Confirmation dialog. Shown after user selects to delete writable contacts. [CHAR LIMIT=NONE]  -->

    <string name="batch_delete_confirmation">The selected contacts will be deleted.</string>

    <!-- Confirmation dialog. Shown after user selects to delete one writable contact [CHAR LIMIT=NONE]  -->

    <string name="single_delete_confirmation">Delete this contact?</string>



    <!-- Confirmation dialog. Shown after user selects to delete multimple writable contacts. [CHAR LIMIT=NONE]  -->

    <string name="batch_delete_confirmation">Delete selected contacts?</string>



    <!-- Confirmation dialog. Shown after user selects to delete readonly contacts. [CHAR LIMIT=NONE] -->

    <string name="batch_delete_read_only_contact_confirmation">Information from read-only accounts will be hidden in your contacts lists, not deleted.</string>

    <string name="batch_delete_read_only_contact_confirmation">Contacts from your read-only accounts will be hidden on this device, not deleted.</string>



    <!-- Confirmation dialog. Shown after user selects to delete contacts from multiple accounts. [CHAR LIMIT=NONE]  -->

    <string name="batch_delete_multiple_accounts_confirmation">These contacts contains information from multiple accounts. Information from read-only accounts will be hidden in your contacts lists, not deleted.</string>

    <string name="batch_delete_multiple_accounts_confirmation">These contacts have details from multiple accounts. Details from read-only accounts will be hidden on this device, not deleted.</string>



    <!-- Warning dialog contents after users selects to delete a contact with multiple Writable sources. -->

    <string name="multipleContactDeleteConfirmation">Deleting this contact will delete information from multiple accounts.</string>

    <string name="multipleContactDeleteConfirmation">Deleting this contact will delete details from multiple accounts.</string>



    <!-- Confirmation dialog contents after users selects to delete a Writable contact. -->

    <string name="deleteConfirmation">This contact will be deleted.</string>

    <string name="deleteConfirmation">Delete this contact?</string>



    <!-- Positive button text of confirmation dialog contents after users selects to delete a Writable contact. [CHAR LIMIT=30] -->

    <string name="deleteConfirmation_positive_button">Delete</string>



    <!-- Menu item to indicate you want to stop editing a contact and NOT save the changes you've made [CHAR LIMIT=30] -->

    <string name="menu_discard">Discard changes</string>
@@ -227,8 +245,11 @@ 
         for some reason doesn't exist anymore. [CHAR LIMIT=NONE]-->

    <string name="invalidContactMessage">The contact doesn\'t exist.</string>



    <!-- Message displayed in a toast after you create a contact shortcut in the launcher [CHAR LIMIT=NONE]-->

    <string name="createContactShortcutSuccessful">Contact widget added to Home screen.</string>

    <!-- Message without name displayed in a toast after you create a contact shortcut in the launcher [CHAR LIMIT=NONE]-->

    <string name="createContactShortcutSuccessful_NoName">Contact added to Home screen.</string>



    <!-- Message with name displayed in a toast after you create a contact shortcut in the launcher [CHAR LIMIT=NONE]-->

    <string name="createContactShortcutSuccessful"><xliff:g id="name">%s</xliff:g> added to Home screen.</string>



    <!-- When picking a contact from a list of all contacts there is an entry at the top of the

         list that allows the user to create a new contact, which this string is used for -->
@@ -337,7 +358,7 @@ 
    </plurals>



    <!-- The title of "all contacts" tab. [CHAR LIMIT=14] -->

    <string name="all_contacts_tab_label">All contacts</string>

    <string name="all_contacts_tab_label">All</string>



    <!-- The title of "favorites" tab. [CHAR LIMIT=14] -->

    <string name="favorites_tab_label">Favorites</string>
@@ -619,6 +640,9 @@ 
    <!-- Contents of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=128] -->

    <string name="cancel_confirmation_dialog_message">Discard your changes?</string>



    <!-- Positive button text of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=40] -->

    <string name="cancel_confirmation_dialog_message_positive_button">Discard</string>



    <!-- Description of a call log entry, made of a call type and a date -->

    <string name="call_type_and_date">

        <xliff:g id="call_type" example="Friends">%1$s</xliff:g>  <xliff:g id="call_short_date" example="Friends">%2$s</xliff:g>
@@ -660,7 +684,7 @@ 
    <string name="contact_editor_prompt_one_account">Your new contact will be synchronized with <xliff:g id="account_name">%1$s</xliff:g>.</string>



    <!-- Message in the contact editor prompt that asks the user which account they want to save the newly created contact to. [CHAR LIMIT=NONE] -->

    <string name="contact_editor_prompt_multiple_accounts">You can synchronize your new contact with one of the following accounts. Which do you want to use?</string>

    <string name="contact_editor_prompt_multiple_accounts">Choose a default account for new contacts:</string>



    <!-- Title of the ContactEditorActivity when creating a new contact. The char

         limit is short and cannot be increased, since this needs to be displayed in a single line
@@ -837,8 +861,8 @@ 
    <!-- "Duplicates" title showing in suggestion card in Quick contact. [CHAR LIMIT=30]-->

    <string name="suggestion_card_duplicates_title">Possible duplicates</string>



    <!-- Help message showing in suggestion card in Quick contact. [CHAR LIMIT=500]-->

    <string name="suggestion_card_help_message">Clean up duplicate contacts for the same person by linking them together.</string>

    <!-- Help message showing in suggestion card in Quick contact. [CHAR LIMIT=NONE]-->

    <string name="suggestion_card_help_message">These contacts might be the same person. You can link them together as a single contact.</string>



    <!-- Linked contacts title showing in contact editor UI. [CHAR LIMIT=30]-->

    <string name="compact_editor_linked_contacts_title">Linked contacts</string>

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

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ public class CancelEditDialogFragment extends DialogFragment { 
        return new AlertDialog.Builder(getActivity())

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setMessage(R.string.cancel_confirmation_dialog_message)

                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {

                .setPositiveButton(R.string.cancel_confirmation_dialog_message_positive_button,

                        new DialogInterface.OnClickListener() {

                            @Override

                            public void onClick(DialogInterface dialogInterface, int which) {

                                final Listener targetListener = (Listener) getTargetFragment();

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

+8 −7
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ public class JoinContactConfirmationDialogFragment extends DialogFragment { 
        builder.setTitle(R.string.joinConfirmation_title);

        builder.setIconAttribute(android.R.attr.alertDialogIcon);

        builder.setMessage(R.string.joinConfirmation);

        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {

        builder.setPositiveButton(R.string.joinConfirmation_positive_button,

                new DialogInterface.OnClickListener() {

                    @Override

                    public void onClick(DialogInterface dialog, int which) {

                        final Listener targetListener = (Listener) getTargetFragment();

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

+10 −7
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ public class SplitContactConfirmationDialogFragment extends DialogFragment { 
        builder.setMessage(mHasPendingChanges

                ? R.string.splitConfirmationWithPendingChanges

                : R.string.splitConfirmation);

        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {

        builder.setPositiveButton(mHasPendingChanges

                ? R.string.splitConfirmationWithPendingChanges_positive_button

                : R.string.splitConfirmation_positive_button,

                new DialogInterface.OnClickListener() {

                    @Override

                    public void onClick(DialogInterface dialog, int which) {

                        final Listener targetListener = (Listener) getTargetFragment();

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

+6 −3
Original line number Diff line number Diff line
@@ -264,18 +264,21 @@ public class ContactDeletionInteraction extends Fragment 


        int readOnlyCount = readOnlyRawContacts.size();

        int writableCount = writableRawContacts.size();

        int positiveButtonId = android.R.string.ok;

        if (readOnlyCount > 0 && writableCount > 0) {

            mMessageId = R.string.readOnlyContactDeleteConfirmation;

        } else if (readOnlyCount > 0 && writableCount == 0) {

            mMessageId = R.string.readOnlyContactWarning;

        } else if (readOnlyCount == 0 && writableCount > 1) {

            mMessageId = R.string.multipleContactDeleteConfirmation;

            positiveButtonId = R.string.deleteConfirmation_positive_button;

        } else {

            mMessageId = R.string.deleteConfirmation;

            positiveButtonId = R.string.deleteConfirmation_positive_button;

        }



        final Uri contactUri = Contacts.getLookupUri(contactId, lookupKey);

        showDialog(mMessageId, contactUri);

        showDialog(mMessageId, positiveButtonId, contactUri);



        // We don't want onLoadFinished() calls any more, which may come when the database is

        // updating.
@@ -286,12 +289,12 @@ public class ContactDeletionInteraction extends Fragment 
    public void onLoaderReset(Loader<Cursor> loader) {

    }



    private void showDialog(int messageId, final Uri contactUri) {

    private void showDialog(int messageId, int positiveButtonId, final Uri contactUri) {

        mDialog = new AlertDialog.Builder(getActivity())

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setMessage(messageId)

                .setNegativeButton(android.R.string.cancel, null)

                .setPositiveButton(android.R.string.ok,

                .setPositiveButton(positiveButtonId,

                    new DialogInterface.OnClickListener() {

                        @Override

                        public void onClick(DialogInterface dialog, int whichButton) {