Code cleanup.

Avoid repetetive boilerplate code by using helper methods.

Change-Id: Id3ce8d07d35d59c08cbc67fa35bbf6daa67c9608

1 files changed, 3 insertions, 14 deletions

diff --git a/src/com/android/dialer/lookup/google/GoogleForwardLookup.java b/src/com/android/dialer/lookup/google/GoogleForwardLookup.java
index 89214925a..215cbfd3b 100644
--- a/src/com/android/dialer/lookup/google/GoogleForwardLookup.java
+++ b/src/com/android/dialer/lookup/google/GoogleForwardLookup.java
@@ -179,15 +179,9 @@ public class GoogleForwardLookup extends ForwardLookup {
 
                 ContactBuilder builder = new ContactBuilder(
                         ContactBuilder.FORWARD_LOOKUP, null, phoneNumber);
-
-                ContactBuilder.Name n = new ContactBuilder.Name();
-                n.displayName = displayName;
-                builder.setName(n);
-
-                ContactBuilder.PhoneNumber pn = new ContactBuilder.PhoneNumber();
-                pn.number = phoneNumber;
-                pn.type = Phone.TYPE_MAIN;
-                builder.addPhoneNumber(pn);
+                builder.setName(ContactBuilder.Name.createDisplayName(displayName));
+                builder.addPhoneNumber(ContactBuilder.PhoneNumber.createMainNumber(phoneNumber));
+                builder.addWebsite(ContactBuilder.WebsiteUrl.createProfile(profileUrl));
 
                 ContactBuilder.Address a = new ContactBuilder.Address();
                 a.formattedAddress = address;
@@ -195,11 +189,6 @@ public class GoogleForwardLookup extends ForwardLookup {
                 a.type = StructuredPostal.TYPE_WORK;
                 builder.addAddress(a);
 
-                ContactBuilder.WebsiteUrl w = new ContactBuilder.WebsiteUrl();
-                w.url = profileUrl;
-                w.type = Website.TYPE_PROFILE;
-                builder.addWebsite(w);
-
                 if (photoUri != null) {
                     builder.setPhotoUri(photoUri);
                 } else {