Backport I0a63ccc4eclair

Must be with I05e62204

Change-Id: I1f15e38715f0a3e39b909b02e85154e9e098fe31

2 files changed, 21 insertions, 1 deletions

diff --git a/src/com/google/wireless/gdata2/contacts/data/Name.java b/src/com/google/wireless/gdata2/contacts/data/Name.java
index 37ece2a..43d72ba 100644
--- a/src/com/google/wireless/gdata2/contacts/data/Name.java
+++ b/src/com/google/wireless/gdata2/contacts/data/Name.java
@@ -18,6 +18,7 @@ public class Name  {
   private String givenNameYomi;
   private String familyNameYomi;
   private String additionalNameYomi;
+  private String fullNameYomi;
 
   /**
    * default empty constructor
@@ -144,7 +145,7 @@ public class Name  {
   public String getGivenNameYomi() {
       return this.givenNameYomi;
   }
-  
+
   /**
    * Setter for givenNameYomi, Phonetic representation
    */
@@ -152,6 +153,20 @@ public class Name  {
     this.givenNameYomi = givenNameYomi;
   }
 
+  /**
+   * Getter for fullNameYomi, Phonetic representation
+   */
+  public String getFullNameYomi() {
+      return this.fullNameYomi;
+  }
+
+  /**
+   * Setter for fullNameYomi, Phonetic representation
+   */
+  public void setFullNameYomi(String fullNameYomi) {
+      this.fullNameYomi = fullNameYomi;
+  }
+
   public void toString(StringBuffer sb) {
     sb.append("Name");
     if (fullName != null) sb.append(" fullName:").append(fullName);
@@ -163,5 +178,6 @@ public class Name  {
     if (givenNameYomi != null) sb.append(" givenNameYomi:").append(givenNameYomi);
     if (familyNameYomi != null) sb.append(" familyNameYomi:").append(familyNameYomi);
     if (additionalNameYomi != null) sb.append(" additionalNameYomi:").append(additionalNameYomi);
+    if (fullNameYomi != null) sb.append(" fullNameYomi:").append(fullNameYomi);
   }
 }
diff --git a/src/com/google/wireless/gdata2/contacts/parser/xml/XmlContactsGDataParser.java b/src/com/google/wireless/gdata2/contacts/parser/xml/XmlContactsGDataParser.java
index 47ef50a..9997e6e 100644
--- a/src/com/google/wireless/gdata2/contacts/parser/xml/XmlContactsGDataParser.java
+++ b/src/com/google/wireless/gdata2/contacts/parser/xml/XmlContactsGDataParser.java
@@ -577,6 +577,8 @@ public class XmlContactsGDataParser extends XmlGDataParser {
         String tag = XmlUtils.nextDirectChildTag(parser, depth);
         if (tag == null) break;
         if (XmlNametable.GD_NAME_GIVENNAME.equals(tag)) {
+          element.setGivenNameYomi(
+              parser.getAttributeValue(null /* ns */, XmlNametable.GD_NAME_YOMI));
           element.setGivenName(XmlUtils.extractChildText(parser));
         } else if (XmlNametable.GD_NAME_ADDITIONALNAME.equals(tag)) {
           element.setAdditionalNameYomi(
@@ -591,6 +593,8 @@ public class XmlContactsGDataParser extends XmlGDataParser {
         } else if (XmlNametable.GD_NAME_SUFFIX.equals(tag)) {
           element.setNameSuffix(XmlUtils.extractChildText(parser));
         } else if (XmlNametable.GD_NAME_FULLNAME.equals(tag)) {
+          element.setFullNameYomi(
+              parser.getAttributeValue(null /* ns */, XmlNametable.GD_NAME_YOMI));
           element.setFullName(XmlUtils.extractChildText(parser));
         }
       }