diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2015-06-04 18:25:46 -0700 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2015-06-05 14:51:27 -0700 |
| commit | cc1e8e2833d1700ff50fac78f1e3895763223bc0 (patch) | |
| tree | b4d7f2a6ebacb405a6768f6a05e35e7091101df3 /src | |
| parent | c7578cd103b420e0a067f176b846a9f738a782bd (diff) | |
| download | android_packages_apps_ExactCalculator-cc1e8e2833d1700ff50fac78f1e3895763223bc0.tar.gz android_packages_apps_ExactCalculator-cc1e8e2833d1700ff50fac78f1e3895763223bc0.tar.bz2 android_packages_apps_ExactCalculator-cc1e8e2833d1700ff50fac78f1e3895763223bc0.zip | |
Update strings per UX review
Bug: 20497138
Bug: 20648856
Change-Id: Id71e2c1922447957b61e3c06b205f991f01eea27
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calculator2/Evaluator.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/com/android/calculator2/Evaluator.java b/src/com/android/calculator2/Evaluator.java index 9b9e830..51ba7b9 100644 --- a/src/com/android/calculator2/Evaluator.java +++ b/src/com/android/calculator2/Evaluator.java @@ -275,7 +275,7 @@ class Evaluator { private void displayCancelledMessage() { new AlertDialog.Builder(mCalculator) .setMessage(R.string.cancelled) - .setPositiveButton(android.R.string.ok, + .setPositiveButton(R.string.dismiss, new DialogInterface.OnClickListener() { public void onClick(DialogInterface d, int which) { } }) @@ -302,21 +302,18 @@ class Evaluator { // implementation. private void displayTimeoutMessage() { - AlertDialog.Builder b = new AlertDialog.Builder(mCalculator); - b.setMessage(R.string.timeout) - .setNegativeButton(android.R.string.ok, + final AlertDialog.Builder builder = new AlertDialog.Builder(mCalculator) + .setMessage(R.string.timeout) + .setNegativeButton(R.string.dismiss, null /* listener */); + if (mTimeout != MAX_TIMEOUT) { + builder.setPositiveButton(R.string.ok_remove_timeout, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface d, int which) { } + public void onClick(DialogInterface d, int which) { + mTimeout = MAX_TIMEOUT; + } }); - if (mTimeout != MAX_TIMEOUT) { - b.setPositiveButton(R.string.ok_remove_timeout, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface d, int which) { - mTimeout = MAX_TIMEOUT; - } - }); - } - b.create().show(); + } + builder.show(); } // Compute initial cache contents and result when we're good and ready. |