Snap for 4373608 from ef7de1fed9e3a065492cf819486f25ce871c092a to pi-release (a7ab8390) · Commits · e / os / android_packages_apps_Contacts

res/values-bs/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -496,7 +496,7 @@
		<string name="about_build_version" msgid="1765533099416999801">"Podverzija"</string>
		<string name="about_open_source_licenses" msgid="6479990452352919641">"Licence otvorenog koda"</string>
		<string name="about_open_source_licenses_summary" msgid="57418386931763994">"Detalji o licenci za softver otvorenog koda"</string>
		<string name="about_privacy_policy" msgid="3705518622499152626">"Pravila o privatnosti"</string>
		<string name="about_privacy_policy" msgid="3705518622499152626">"Pravila privatnosti"</string>
		<string name="about_terms_of_service" msgid="4642400812150296723">"Uslovi pružanja usluge"</string>
		<string name="activity_title_licenses" msgid="5467767062737708066">"Licence otvorenog koda"</string>
		<string name="url_open_error_toast" msgid="452592089815420457">"Otvaranje URL-a nije uspjelo."</string>

res/values-es/strings.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -54,14 +54,14 @@
		<string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Vinculando"</string>
		<string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Desvinculando"</string>
		<string name="menu_joinAggregate" msgid="3599512127797513606">"Vincular"</string>
		<string name="menu_linkedContacts" msgid="400444389718855621">"Ver contactos enlazados"</string>
		<string name="menu_linkedContacts" msgid="400444389718855621">"Ver contactos vinculados"</string>
		<string name="menu_save" msgid="1727844363591825909">"Guardar"</string>
		<string name="titleJoinContactDataWith" msgid="6825255752748313944">"Vincular contactos"</string>
		<string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Selecciona el contacto que quieras vincular con <xliff:g id="NAME">%s</xliff:g>:"</string>
		<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contactos sugeridos"</string>
		<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos los contactos"</string>
		<string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> enlazado"</string>
		<string name="contactsJoinedMessage" msgid="3343535986195643136">"Contactos enlazados"</string>
		<string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> vinculado"</string>
		<string name="contactsJoinedMessage" msgid="3343535986195643136">"Contactos vinculados"</string>
		<string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Se ha eliminado a <xliff:g id="NAME">%1$s</xliff:g>"</string>
		<string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Se ha eliminado a <xliff:g id="NAME_0">%1$s</xliff:g> y a <xliff:g id="NAME_1">%2$s</xliff:g>"</string>
		<string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"Se ha eliminado a <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>…"</string>
		@@ -108,7 +108,7 @@
		<string name="contactUnlinkedToast" msgid="7122823195786012553">"Contactos desvinculados"</string>
		<string name="contactSavedErrorToast" msgid="4827033473908688031">"No se han podido guardar los cambios en el contacto"</string>
		<string name="contactUnlinkErrorToast" msgid="2706297508166952431">"No se ha podido desvincular el contacto"</string>
		<string name="contactJoinErrorToast" msgid="5735129234573327701">"No se ha podido enlazar el contacto"</string>
		<string name="contactJoinErrorToast" msgid="5735129234573327701">"No se ha podido vincular el contacto"</string>
		<string name="contactGenericErrorToast" msgid="3885457515665783976">"No se ha podido guardar el contacto"</string>
		<string name="contactPhotoSavedErrorToast" msgid="6860883564984042194">"No se han podido guardar los cambios en la foto del contacto"</string>
		<string name="groupLoadErrorToast" msgid="7536267148196064554">"No se ha podido cargar la etiqueta"</string>
		@@ -193,7 +193,7 @@
		<string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Editar contacto"</string>
		<string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Solo lectura"</string>
		<string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Seleccionar contacto para editarlo"</string>
		<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Contactos enlazados"</string>
		<string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Contactos vinculados"</string>
		<string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Añadir"</string>
		<string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Desvincular"</string>
		<string name="add_account" msgid="8201790677994503186">"Añadir cuenta"</string>

res/values-th/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@
		<string name="sms_assistant" msgid="2773424339923116234">"ส่งข้อความถึง <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
		<string name="sms_mms" msgid="4069352461380762677">"ส่งข้อความถึง MMS"</string>
		<string name="sms_by_shortcut" msgid="7741770672976099517">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ข้อความ)"</string>
		<string name="description_video_call" msgid="7120921378651700947">"ใช้แฮงเอาท์วิดีโอ"</string>
		<string name="description_video_call" msgid="7120921378651700947">"ใช้ Hangouts วิดีโอ"</string>
		<string name="clearFrequentsConfirmation_title" msgid="766292372438450432">"ล้างผู้ที่คุณติดต่อด้วยบ่อยๆ หรือไม่"</string>
		<string name="clearFrequentsConfirmation" msgid="2270554975938265734">"คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contact และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น"</string>
		<string name="clearFrequentsProgress_title" msgid="5157001637482794212">"กำลังล้างผู้ที่คุณติดต่อด้วยบ่อยๆ…"</string>
		@@ -496,7 +496,7 @@
		<string name="url_open_error_toast" msgid="452592089815420457">"เปิด URL ไม่สำเร็จ"</string>
		<string name="account_filter_view_checked" msgid="6696859503887762213">"เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g> แล้ว"</string>
		<string name="account_filter_view_not_checked" msgid="2248684521205038389">"ไม่ได้เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
		<string name="description_search_video_call" msgid="5841525580339803272">"เริ่มแฮงเอาท์วิดีโอ"</string>
		<string name="description_search_video_call" msgid="5841525580339803272">"เริ่ม Hangouts วิดีโอ"</string>
		<string name="description_delete_contact" msgid="53835657343783663">"ลบ"</string>
		<string name="description_no_name_header" msgid="8884991311595943271">"จุดไข่ปลา"</string>
		<string name="callDurationSecondFormat" msgid="7067644915903528776">"<xliff:g id="SECONDS">%s</xliff:g> วินาที"</string>

src/com/android/contacts/drawer/DrawerFragment.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,12 @@ public class DrawerFragment extends Fragment implements AccountsListener {
		return;
		}
		mGroupListItems.clear();
		// Initialize cursor's position. If Activity relaunched by orientation change,
		// only onLoadFinished is called. OnCreateLoader is not called.
		// The cursor's position is remain end position by moveToNext when the last
		// onLoadFinished was called.
		// Therefore, if cursor position was not initialized mGroupListItems is empty.
		data.moveToPosition(-1);
		for (int i = 0; i < data.getCount(); i++) {
		if (data.moveToNext()) {
		mGroupListItems.add(GroupUtil.getGroupListItem(data, i));

src/com/android/contacts/group/GroupNameEditDialogFragment.java

+18 −2

Original line number	Diff line number	Diff line
		@@ -233,7 +233,12 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements
		dismiss();
		return;
		}
		final String name = getGroupName();
		String name = getGroupName();
		// Trim group name, when group is saved.
		// When "Group" exists, do not save " Group ". This behavior is the same as Google Contacts.
		if (!TextUtils.isEmpty(name)) {
		name = name.trim();
		}
		// Note we don't check if the loader finished populating mExistingGroups. It's not the
		// end of the world if the user ends up with a duplicate group and in practice it should
		// never really happen (the query should complete much sooner than the user can edit the
		@@ -283,8 +288,19 @@ public final class GroupNameEditDialogFragment extends DialogFragment implements
		public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
		mExistingGroups = new HashSet<>();
		final GroupUtil.GroupsProjection projection = new GroupUtil.GroupsProjection(data);
		// Initialize cursor's position. If Activity relaunched by orientation change,
		// only onLoadFinished is called. OnCreateLoader is not called.
		// The cursor's position is remain end position by moveToNext when the last onLoadFinished
		// was called. Therefore, if cursor position was not initialized mExistingGroups is empty.
		data.moveToPosition(-1);
		while (data.moveToNext()) {
		final String title = projection.getTitle(data);
		String title = projection.getTitle(data);
		// Trim existing group name.
		// When " Group " exists, do not save "Group".
		// This behavior is the same as Google Contacts.
		if (!TextUtils.isEmpty(title)) {
		title = title.trim();
		}
		// Empty system groups aren't shown in the nav drawer so it would be confusing to tell
		// the user that they already exist. Instead we allow them to create a duplicate
		// group in this case. This is how the web handles this case as well (it creates a