Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a6398ef authored by Takahiro Manabe's avatar Takahiro Manabe Committed by android-build-merger
Browse files

Merge "Change confirm Import/export cancel dialog string" am: 344beb30 

am: beba5ed5

Change-Id: I0593f5b7bb347cd4ee8dfe6fc21b2eadc1e91ff1
parents ed982f24 beba5ed5

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)