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

Commit 3187632e authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 4904520 - Swap force close/report buttons 

Make the force close dialogs consistent with both the new rules for
wizardy-button bar UI flows and the previous arrangement that people
are used to. Force close = negative/back/cancel, Report =
positive/next/ok.

Change-Id: I212ba172f8076238a1833100b025b6e25a538a65
parent 8457f0fe

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_POSITIVE,

        setButton(DialogInterface.BUTTON_NEGATIVE,

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

                mHandler.obtainMessage(FORCE_QUIT));



        if (app.errorReportReceiver != null) {

            setButton(DialogInterface.BUTTON_NEGATIVE,

            setButton(DialogInterface.BUTTON_POSITIVE,

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

                    mHandler.obtainMessage(FORCE_QUIT_AND_REPORT));

        }

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

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

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



        setButton(DialogInterface.BUTTON_POSITIVE,

        setButton(DialogInterface.BUTTON_NEGATIVE,

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

                mHandler.obtainMessage(FORCE_CLOSE));

        setButton(DialogInterface.BUTTON_NEUTRAL,
@@ -85,7 +85,7 @@ class AppNotRespondingDialog extends BaseErrorDialog { 
                mHandler.obtainMessage(WAIT));



        if (app.errorReportReceiver != null) {

            setButton(DialogInterface.BUTTON_NEGATIVE,

            setButton(DialogInterface.BUTTON_POSITIVE,

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

                    mHandler.obtainMessage(WAIT_AND_REPORT));

        }