From 40a9784d48211048fa3731a3ffdccda475750090 Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Sun, 14 Aug 2011 17:12:10 -0700 Subject: [PATCH] Fix bug 5154361 - New force close dialog text breaks button order rules Reorder the force close/ANR dialog buttons to better match the new rules/intent from UX. Change-Id: I30fed56aabd0cc91d07852807347057176d82aaa --- services/java/com/android/server/am/AppErrorDialog.java | 4 ++-- .../java/com/android/server/am/AppNotRespondingDialog.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/java/com/android/server/am/AppErrorDialog.java b/services/java/com/android/server/am/AppErrorDialog.java index 917259acf1b55..a769c05c16486 100644 --- a/services/java/com/android/server/am/AppErrorDialog.java +++ b/services/java/com/android/server/am/AppErrorDialog.java @@ -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)); } diff --git a/services/java/com/android/server/am/AppNotRespondingDialog.java b/services/java/com/android/server/am/AppNotRespondingDialog.java index b40f87a90edbf..b546ae7de3563 100644 --- a/services/java/com/android/server/am/AppNotRespondingDialog.java +++ b/services/java/com/android/server/am/AppNotRespondingDialog.java @@ -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)); }