Merge "Change confirm Import/export cancel dialog string"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1ea9708..d461455 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
diff --git a/src/com/android/contacts/vcard/CancelActivity.java b/src/com/android/contacts/vcard/CancelActivity.java
index 5787d62..a6b58cc 100644
--- a/src/com/android/contacts/vcard/CancelActivity.java
+++ b/src/com/android/contacts/vcard/CancelActivity.java
@@ -91,9 +91,9 @@
}
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)