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

Commit f612d7ce authored by Tingting Wang's avatar Tingting Wang Committed by android-build-merger
Browse files

Merge "Show phonetic name only when it doesn\'t equal display name." into nyc-dev 

am: 88c9d49d

* commit '88c9d49d':
  Show phonetic name only when it doesn't equal display name.
parents 2ea9322b 88c9d49d

src/com/android/contacts/quickcontact/QuickContactActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -1241,8 +1241,8 @@ public class QuickContactActivity extends ContactsActivity 
                displayName, mContactData.getDisplayNameSource() == DisplayNameSources.PHONE);

        final String phoneticName = ContactDisplayUtils.getPhoneticName(this, data);

        if (mScroller != null) {

            if (mContactData.getDisplayNameSource() != DisplayNameSources.STRUCTURED_PHONETIC_NAME

                    && !TextUtils.isEmpty(phoneticName)) {

            // Show phonetic name only when it doesn't equal the display name.

            if (!TextUtils.isEmpty(phoneticName) && !phoneticName.equals(displayName)) {

                mScroller.setPhoneticName(phoneticName);

            } else {

                mScroller.setPhoneticNameGone();