Snap for 4462748 from fd1472f0f1860c05f567f413b570eecc420d0692 to pi-release (d6067b1b) · Commits · e / os / android_packages_apps_Contacts

Android.mk

+1 −5

Original line number	Diff line number	Diff line
		@@ -39,11 +39,7 @@ LOCAL_PACKAGE_NAME := Contacts
		LOCAL_CERTIFICATE := shared
		LOCAL_PRIVILEGED_MODULE := true

		LOCAL_PROGUARD_FLAG_FILES := \
		proguard.flags \
		../../../frameworks/support/core-ui/proguard-rules.pro \
		../../../frameworks/support/design/proguard-rules.pro \
		../../../frameworks/support/v7/recyclerview/proguard-rules.pro
		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

		LOCAL_SDK_VERSION := current
		LOCAL_MIN_SDK_VERSION := 21

res/values-ar/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@
		<string name="setting_about" msgid="7014388749752042863">"حول جهات الاتصال"</string>
		<string name="share_favorite_contacts" msgid="4280926751003081042">"مشاركة جهات الاتصال المفضلة"</string>
		<string name="share_contacts" msgid="8109287987498711664">"مشاركة جميع جهات الاتصال"</string>
		<string name="share_contacts_failure" msgid="1216431977330560559">"أخفقت مشاركة جهات الاتصال."</string>
		<string name="share_contacts_failure" msgid="1216431977330560559">"تعذّرت مشاركة جهات الاتصال."</string>
		<string name="dialog_export" msgid="1628001095187741417">"تصدير جهات الاتصال"</string>
		<string name="dialog_import" msgid="2423592905927819672">"استيراد جهات اتصال من"</string>
		<string name="share_error" msgid="948429331673358107">"لا يمكن مشاركة جهة الاتصال هذه."</string>

res/values-sw/strings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@
		<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Imemaliza kuhamisha <xliff:g id="FILENAME">%s</xliff:g>"</string>
		<string name="exporting_vcard_finished_title_fallback" msgid="6060472638008218274">"Anwani zimehamishwa."</string>
		<string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"Anwani zimehamishwa; bofya arifa ili ushiriki anwani."</string>
		<string name="touch_to_share_contacts" msgid="4882485525268469736">"Gonga ili ushiriki anwani."</string>
		<string name="touch_to_share_contacts" msgid="4882485525268469736">"Gusa ili ushiriki anwani."</string>
		<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Kuhamisha <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa"</string>
		<string name="exporting_contact_list_title" msgid="9072240631534457415">"Inahamisha data ya anwani"</string>
		<string name="exporting_contact_list_message" msgid="3367949209642931952">"Data ya anwani inahamishwa."</string>
		@@ -515,9 +515,9 @@
		<string name="sim_import_failed_toast" msgid="5559267299793622705">"Imeshindwa kuleta anwani zilizo kwenye SIM kadi"</string>
		<string name="sim_import_title" msgid="2511154832820812822">"Leta kutoka kwenye SIM kadi"</string>
		<string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Ghairi"</string>
		<string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gonga ili uuwashe."</string>
		<string name="auto_sync_off" msgid="2180147284456026587">"Usawazishaji wa kiotomatiki umezimwa. Gusa ili uuwashe."</string>
		<string name="dismiss_sync_alert" msgid="8941131776605093596">"Ondoa"</string>
		<string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gonga ili uuwashe."</string>
		<string name="account_sync_off" msgid="7646143254066243924">"Usawazishaji wa akaunti umezimwa. Gusa ili uuwashe."</string>
		<string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Je, unataka kuwasha usawazishaji wa kiotomatiki?"</string>
		<string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Mabadiliko utakayofanya katika programu na akaunti zote, wala si katika Anwani tu, yatasawazishwa kwenye wavuti na kwenye vifaa vyako."</string>
		<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Washa"</string>

res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -1586,4 +1586,10 @@
		<!-- Text shown when viewing channel settings for default Contacts notifications [CHAR LIMIT=50] -->
		<string name="contacts_default_notification_channel">Notifications</string>

		<!-- Text of Positive Button in dialog -->
		<string name="yes_button">Yes</string>

		<!-- Text of Negative Button in dialog -->
		<string name="no_button">No</string>

		</resources>

src/com/android/contacts/vcard/CancelActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -91,9 +91,9 @@ public class CancelActivity extends Activity implements ServiceConnection {
		}
		final AlertDialog.Builder builder = new AlertDialog.Builder(this)
		.setMessage(message)
		.setPositiveButton(android.R.string.ok, new RequestCancelListener())
		.setPositiveButton(R.string.yes_button, new RequestCancelListener())
		.setOnCancelListener(mCancelListener)
		.setNegativeButton(android.R.string.cancel, mCancelListener);
		.setNegativeButton(R.string.no_button, mCancelListener);
		return builder.create();
		} else if (id == R.id.dialog_cancel_failed) {
		final AlertDialog.Builder builder = new AlertDialog.Builder(this)