diff options
author | Hans Boehm <hboehm@google.com> | 2015-10-11 13:43:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-11 13:43:16 +0000 |
commit | b7be7bfdec8d4823a448c45fe164e9640ea3e83f (patch) | |
tree | 20d1abda14e1ed86455c555d9989f0d1c5fe9a8b /src/com/android | |
parent | bd905403f4b4d71bc9c361baf62c91c4f09401c7 (diff) | |
parent | b7bd34886fb39401b6e38ad97634655a0d025902 (diff) | |
download | android_packages_apps_ExactCalculator-b7be7bfdec8d4823a448c45fe164e9640ea3e83f.tar.gz android_packages_apps_ExactCalculator-b7be7bfdec8d4823a448c45fe164e9640ea3e83f.tar.bz2 android_packages_apps_ExactCalculator-b7be7bfdec8d4823a448c45fe164e9640ea3e83f.zip |
am b7bd3488: Merge "Announce when formula has been completely deleted." into mnc-dr-dev
* commit 'b7bd34886fb39401b6e38ad97634655a0d025902':
Announce when formula has been completely deleted.
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/calculator2/Calculator.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java index 035f5b9..99ef032 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -454,7 +454,7 @@ public class Calculator extends Activity if (KeyMaps.isBinary(id) || KeyMaps.isSuffix(id)) { mEvaluator.collapse(); } else { - announceClearForAccessibility(); + announceClearedForAccessibility(); mEvaluator.clear(); } setState(CalculatorState.INPUT); @@ -653,6 +653,11 @@ public class Calculator extends Activity } else { mEvaluator.delete(); } + if (mEvaluator.getExpr().isEmpty() + && (mUnprocessedChars == null || mUnprocessedChars.isEmpty())) { + // Resulting formula won't be announced, since it's empty. + announceClearedForAccessibility(); + } redisplayAfterFormulaChange(); } @@ -710,8 +715,8 @@ public class Calculator extends Activity animatorSet.start(); } - private void announceClearForAccessibility() { - mResultText.announceForAccessibility(getResources().getString(R.string.desc_clr)); + private void announceClearedForAccessibility() { + mResultText.announceForAccessibility(getResources().getString(R.string.cleared)); } private void onClear() { @@ -719,7 +724,7 @@ public class Calculator extends Activity return; } cancelIfEvaluating(true); - announceClearForAccessibility(); + announceClearedForAccessibility(); reveal(mCurrentButton, R.color.calculator_accent_color, new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { |