Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2011-08-14 17:23:29 -07:00
committed by Android (Google) Code Review
parent 32ab095751 40a9784d48
commit 27b1c978ce
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/AppErrorDialog.java
View File

@@ -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));
}

6
services/java/com/android/server/am/AppNotRespondingDialog.java
View File

@@ -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));
}