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

Commit 8d66f45f authored by Jim Laskey's avatar Jim Laskey Committed by Android (Google) Code Review
Browse files

Merge "Save contact toast shows display name"

parents dbda9900 b1671053

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -296,6 +296,9 @@ 
    <!-- The text displayed when there's no contacts in the main contacts list [CHAR LIMIT=70] -->

    <string name="emptyMainList">Your contacts list is empty</string>



    <!-- Toast displayed when a contact is saved [CHAR LIMIT=30] -->

    <string name="contactSavedNamedToast"><xliff:g id="display_name">%s</xliff:g> saved</string>



    <!-- Toast displayed when a contact is saved [CHAR LIMIT=NONE] -->

    <string name="contactSavedToast">Contact saved</string>

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

+11 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.Activity; 
import android.app.Fragment;

import android.app.LoaderManager;

import android.content.ActivityNotFoundException;

import android.content.ContentResolver;

import android.content.ContentUris;

import android.content.ContentValues;

import android.content.Context;
@@ -1524,8 +1525,16 @@ public class CompactContactEditorFragment extends Fragment implements 
                                .show();

                        break;

                    default:

                        Toast.makeText(mContext, R.string.contactSavedToast, Toast.LENGTH_SHORT)

                                .show();

                        final String displayName = getContent().getPrimaryNameEditorView()

                                .getDisplayName();

                        final String toastMessage;

                        if (!TextUtils.isEmpty(displayName)) {

                            toastMessage = getResources().getString(

                                    R.string.contactSavedNamedToast, displayName);

                        } else {

                            toastMessage = getResources().getString(R.string.contactSavedToast);

                        }

                        Toast.makeText(mContext, toastMessage, Toast.LENGTH_SHORT).show();

                }



            } else {