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

Commit d1cc5fe9 authored by Walter Jang's avatar Walter Jang
Browse files

Try to make the cancel editing confirmation dialog less confusing 

Bug 26615850
Bug 26594357

Change-Id: I651e9a056227a7149051c3f9bb55b26d24cd7fad
parent 85790044

res/values/strings.xml

+10 −3
Original line number Original line Diff line number Diff line
@@ -641,10 +641,17 @@ 
    <string name="toast_text_copied">Text copied</string>

    <string name="toast_text_copied">Text copied</string>





    <!-- Contents of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=128] -->

    <!-- Contents of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=128] -->

    <string name="cancel_confirmation_dialog_message">Discard your changes?</string>

    <string name="cancel_confirmation_dialog_message">Discard your changes and quit editing?</string>





    <!-- Positive button text of the alert dialog when the user hits the Cancel button in the editor [CHAR LIMIT=40] -->

    <!-- Positive button text for the cancel editing confirmation dialog.

    <string name="cancel_confirmation_dialog_message_positive_button">Discard</string>

      Pushing this button indicates that the user wishes to discard the changes they have already

      made and close the editor. [CHAR LIMIT=50] -->

    <string name="cancel_confirmation_dialog_cancel_editing_button">Discard changes</string>



    <!-- Negative button text for the cancel editing confirmation dialog.

      Pushing this button indicates that the user wishes to continue editing

      and return to the editor [CHAR LIMIT=40] -->

    <string name="cancel_confirmation_dialog_keep_editing_button">Keep editing</string>





    <!-- Description of a call log entry, made of a call type and a date -->

    <!-- Description of a call log entry, made of a call type and a date -->

    <string name="call_type_and_date">

    <string name="call_type_and_date">

src/com/android/contacts/editor/CancelEditDialogFragment.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ public class CancelEditDialogFragment extends DialogFragment { 
        return new AlertDialog.Builder(getActivity())

        return new AlertDialog.Builder(getActivity())

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setMessage(R.string.cancel_confirmation_dialog_message)

                .setMessage(R.string.cancel_confirmation_dialog_message)

                .setPositiveButton(R.string.cancel_confirmation_dialog_message_positive_button,

                .setPositiveButton(R.string.cancel_confirmation_dialog_cancel_editing_button,

                        new DialogInterface.OnClickListener() {

                        new DialogInterface.OnClickListener() {

                            @Override

                            @Override

                            public void onClick(DialogInterface dialogInterface, int which) {

                            public void onClick(DialogInterface dialogInterface, int which) {
@@ -55,7 +55,7 @@ public class CancelEditDialogFragment extends DialogFragment { 
                            }

                            }

                        }

                        }

                )

                )

                .setNegativeButton(android.R.string.cancel, null)

                .setNegativeButton(R.string.cancel_confirmation_dialog_keep_editing_button, null)

                .create();

                .create();

    }

    }