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

Commit b1671053 authored by James Laskey's avatar James Laskey
Browse files

Save contact toast shows display name

Bug: 29882910
Change-Id: Icdf0ea1e8c4fac9104d97de83d6ff6f5cbe59142
Test: manual tests with fresh contact (only name, only number)
Test: manual tests with updating old contact (change name)
parent 2279be67
Loading
Loading
Loading
Loading
+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>

+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;
@@ -1531,8 +1532,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 {