Merge "Makes the call details scrollable."
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eaf6ab8..0c0a20a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,14 +314,14 @@
<!-- Displayed in a spinner dialog as user changes to display options are saved -->
<string name="savingDisplayGroups">Saving display options\u2026</string>
- <!-- Toast displayed when a contact is saved -->
- <string name="contactSavedToast">Contact saved.</string>
+ <!-- Toast displayed when a contact is saved [CHAR LIMIT=NONE] -->
+ <string name="contactSavedToast">Contact saved</string>
<!-- Toast displayed when saving a contact failed -->
<string name="contactSavedErrorToast">Error, unable to save contact changes.</string>
<!-- Toast displayed when a group is saved [CHAR LIMIT=NONE] -->
- <string name="groupSavedToast">Group saved.</string>
+ <string name="groupSavedToast">Group saved</string>
<!-- Toast displayed when saving a group failed [CHAR LIMIT=NONE] -->
<string name="groupSavedErrorToast">Error, unable to save group changes.</string>
@@ -1051,7 +1051,7 @@
<!-- Header that expands to list all website types when editing a website of a contact [CHAR LIMIT=20] -->
<string name="websiteLabelsGroup">Website</string>
<!-- Header that expands to list all event types when editing an event of a contact [CHAR LIMIT=20] -->
- <string name="eventLabelsGroup">Event</string>
+ <string name="eventLabelsGroup">Events</string>
<!-- Header for the list of all relationships for a contact [CHAR LIMIT=20] -->
<string name="relationLabelsGroup">Relationship</string>
<!-- Header for the list of all groups for a contact [CHAR LIMIT=20] -->
@@ -1379,6 +1379,12 @@
<!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=22] -->
<string name="add_organization">Add organization</string>
+ <!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=12] -->
+ <string name="event_edit_field_hint_text">Date</string>
+
+ <!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->
+ <string name="group_edit_field_hint_text">Group name</string>
+
<!-- Attbution of a contact status update, when the time of update is unknown -->
<string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>
@@ -1771,6 +1777,12 @@
<!-- String describing the text on the header of the profile contact in the contacts list [CHAR LIMIT=20] -->
<string name="user_profile_contacts_list_header">ME</string>
+ <!-- Header label in the contact editor for a profile that is local to the device only (and not associated with any account) [CHAR LIMIT=25] -->
+ <string name="local_profile_title">My local profile</string>
+
+ <!-- Header label in the contact editor for a profile that comes from an external third-party app whose name is given by source [CHAR LIMIT=20] -->
+ <string name="external_profile_title">My <xliff:g id="external_source">%1$s</xliff:g> profile</string>
+
<!-- Toast shown when the app starts showing all contacts regardless of its current
contact filter state. [CHAR LIMIT=64] -->
<string name="toast_displaying_all_contacts">Displaying all contacts</string>
diff --git a/src/com/android/contacts/editor/EventFieldEditorView.java b/src/com/android/contacts/editor/EventFieldEditorView.java
index e7da6c1..4a5a502 100644
--- a/src/com/android/contacts/editor/EventFieldEditorView.java
+++ b/src/com/android/contacts/editor/EventFieldEditorView.java
@@ -80,7 +80,7 @@
Resources resources = mContext.getResources();
mPrimaryTextColor = resources.getColor(R.color.primary_text_color);
mSecondaryTextColor = resources.getColor(R.color.secondary_text_color);
- mNoDateString = mContext.getString(R.string.add_new_entry_for_section);
+ mNoDateString = mContext.getString(R.string.event_edit_field_hint_text);
mDateView = (Button) findViewById(R.id.date_view);
mDateView.setOnClickListener(new OnClickListener() {
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index 042b80a..42d2edd 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -115,7 +115,7 @@
Resources resources = mContext.getResources();
mPrimaryTextColor = resources.getColor(R.color.primary_text_color);
mSecondaryTextColor = resources.getColor(R.color.secondary_text_color);
- mNoGroupString = mContext.getString(R.string.add_new_entry_for_section);
+ mNoGroupString = mContext.getString(R.string.group_edit_field_hint_text);
}
@Override
diff --git a/src/com/android/contacts/list/ContactBrowseListFragment.java b/src/com/android/contacts/list/ContactBrowseListFragment.java
index fc9abe7..2380345 100644
--- a/src/com/android/contacts/list/ContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/ContactBrowseListFragment.java
@@ -378,7 +378,8 @@
return;
}
- if (!isSearchMode() && mFilter != null) {
+ boolean searchMode = isSearchMode();
+ if (!searchMode && mFilter != null) {
adapter.setFilter(mFilter);
if (mSelectionRequired
|| mFilter.filterType == ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) {
@@ -387,8 +388,8 @@
}
}
- // Display the user's profile.
- adapter.setIncludeProfile(true);
+ // Display the user's profile if not in search mode
+ adapter.setIncludeProfile(!searchMode);
}
@Override
diff --git a/src/com/android/contacts/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
index e9804f5..f081921 100644
--- a/src/com/android/contacts/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -196,7 +196,8 @@
+ "SELECT DISTINCT " + RawContacts.CONTACT_ID
+ " FROM raw_contacts"
+ " WHERE " + RawContacts.ACCOUNT_TYPE + "=?"
- + " AND " + RawContacts.ACCOUNT_NAME + "=?");
+ + " AND " + RawContacts.ACCOUNT_NAME + "=?"
+ + " OR " + Contacts.IS_USER_PROFILE + "=1");
selectionArgs.add(filter.accountType);
selectionArgs.add(filter.accountName);
if (filter.dataSet != null) {