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

Commit 27b1c978 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5154361 - New force close dialog text breaks button order rules"

parents 32ab0957 40a9784d

services/java/com/android/server/am/AppErrorDialog.java

+2 −2
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ class AppErrorDialog extends BaseErrorDialog { 


        setCancelable(false);



        setButton(DialogInterface.BUTTON_NEGATIVE,

        setButton(DialogInterface.BUTTON_POSITIVE,

                res.getText(com.android.internal.R.string.force_close),

                mHandler.obtainMessage(FORCE_QUIT));



        if (app.errorReportReceiver != null) {

            setButton(DialogInterface.BUTTON_POSITIVE,

            setButton(DialogInterface.BUTTON_NEGATIVE,

                    res.getText(com.android.internal.R.string.report),

                    mHandler.obtainMessage(FORCE_QUIT_AND_REPORT));

        }

services/java/com/android/server/am/AppNotRespondingDialog.java

+3 −3
Original line number Diff line number Diff line
@@ -77,15 +77,15 @@ class AppNotRespondingDialog extends BaseErrorDialog { 
                ? res.getString(resid, name1.toString(), name2.toString())

                : res.getString(resid, name1.toString()));



        setButton(DialogInterface.BUTTON_NEGATIVE,

        setButton(DialogInterface.BUTTON_POSITIVE,

                res.getText(com.android.internal.R.string.force_close),

                mHandler.obtainMessage(FORCE_CLOSE));

        setButton(DialogInterface.BUTTON_NEUTRAL,

        setButton(DialogInterface.BUTTON_NEGATIVE,

                res.getText(com.android.internal.R.string.wait),

                mHandler.obtainMessage(WAIT));



        if (app.errorReportReceiver != null) {

            setButton(DialogInterface.BUTTON_POSITIVE,

            setButton(DialogInterface.BUTTON_NEUTRAL,

                    res.getText(com.android.internal.R.string.report),

                    mHandler.obtainMessage(WAIT_AND_REPORT));

        }