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

Commit 3bb167c1 authored by Jay Shrauner's avatar Jay Shrauner Committed by Android (Google) Code Review
Browse files

Merge "Rename phoneHasType/emailHasType" into ub-contactsdialer-a-dev

parents a6e7230b 7b2ec523

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

+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class RawContactReadOnlyEditorView extends BaseRawContactEditorView 
                        phoneNumber, phone.getPhoneNormalizedNumber(),

                        GeoUtil.getCurrentCountryIso(getContext()));

                CharSequence phoneType = null;

                if (phone.phoneHasType()) {

                if (phone.hasPhoneType()) {

                    phoneType = Phone.getTypeLabel(

                            res, phone.getPhoneType(), phone.getPhoneLabel());

                }
@@ -192,7 +192,7 @@ public class RawContactReadOnlyEditorView extends BaseRawContactEditorView 
                    continue;

                }

                CharSequence emailType = null;

                if (email.emailHasType()) {

                if (email.hasEmailType()) {

                    emailType = Email.getTypeLabel(

                            res, email.getEmailType(), email.getEmailLabel());

                }