Expandable structured support, organize editors, much more.
Wrote expandable editor support, so that StructuredName and
StructuredPostal could be displayed compactly on smaller
screens, but still expanded to edit all possible fields.
Reorganized editors to directly inflate classes instead of
using ViewHolder pattern. This helps us prepare for focus
saving logic coming soon, and also required that each data
row have getViewId() to be uniquely identified.
When editing EAS contacts, don't use separate types for
"Email 1", "Email 2", etc, and instead use a single overall
limit on type-less values. (This is dependant on
http://b/2065904 being resolved.)
Defined fallback "on-phone" account separately to prevent
confusion with Google account, also limited the possible
data types that could be entered.
Suspend aggregation while persisting RawContacts updates
to prevent possible re-aggregation and user confusion when
returning to View activity. Also correctly generate
AggregationExceptions when inserting new RawContacts under
an existing aggregate. Fixes http://b/2087517
When inserting Google contacts, add GroupMembership for
"My Contacts" to help visibility, fixing http://b/2070479
Don't reprompt for account when rotating during INSERT,
fixing http://b/2084585 and hide editor until finished
with async loading. Ensure that specific rows exist so
we always have StructuredName to edit, and have waiting
Phone and Email fields for INSERT.
Used better method of creating generic ArrayList/HashMap.
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bc4d7e5..00ef14b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -856,14 +856,6 @@
<string name="type_radio">Radio</string>
<string name="type_assistant">Assistant</string>
-<string name="type_email_1">Email 1</string>
-<string name="type_email_2">Email 2</string>
-<string name="type_email_3">Email 3</string>
-
-<string name="type_im_1">Im 1</string>
-<string name="type_im_2">Im 2</string>
-<string name="type_im_3">Im 3</string>
-
<string name="type_im_aim">AIM</string>
<string name="type_im_msn">Windows Live</string>
<string name="type_im_yahoo">Yahoo</string>
@@ -891,6 +883,10 @@
group that would also cause all ungrouped contacts to stop syncing. -->
<string name="display_warn_remove_ungrouped">Removing \'<xliff:g id="group" example="Starred">%s</xliff:g>\' from sync will also remove any ungrouped contacts from sync.</string>
+ <!-- Title for data source when creating or editing a contact that doesn't
+ belong to a specific account. This contact will only exist on the phone
+ and will not be synced. -->
+ <string name="account_phone">Phone-only (unsynced)</string>
<string name="call_home">Call home</string>
<string name="call_mobile">Call mobile</string>
@@ -902,8 +898,6 @@
<string name="call_custom">Call <xliff:g id="custom">%s</xliff:g></string>
<!-- exchange specific -->
-<string name="call_home_2">Call home 2</string>
-<string name="call_work_2">Call work 2</string>
<string name="call_car">Call car</string>
<string name="call_company_main">Call company main</string>
<string name="call_mms">Call MMS</string>
@@ -923,8 +917,6 @@
<string name="sms_custom">Text <xliff:g id="custom">%s</xliff:g></string>
<!-- exchange specific -->
-<string name="sms_home_2">Text home 2</string>
-<string name="sms_work_2">Text work 2</string>
<string name="sms_car">Text car</string>
<string name="sms_company_main">Text company main</string>
<string name="sms_mms">Text MMS</string>
@@ -938,10 +930,6 @@
<string name="email_other">Email other</string>
<string name="email_custom">Email <xliff:g id="custom">%s</xliff:g></string>
-<string name="email_1">Email 1</string>
-<string name="email_2">Email 2</string>
-<string name="email_3">Email 2</string>
-
@@ -961,5 +949,15 @@
<string name="postal_country">Country</string>
+<string name="name_given">Given name</string>
+<string name="name_family">Family name</string>
+<string name="name_prefix">Name prefix</string>
+<string name="name_middle">Middle name</string>
+<string name="name_suffix">Name suffix</string>
+<string name="name_phonetic_given">Phonetic given name</string>
+<string name="name_phonetic_middle">Phonetic middle name</string>
+<string name="name_phonetic_family">Phonetic family name</string>
+
+
</resources>