diff options
| author | Hans Boehm <hboehm@google.com> | 2015-10-11 05:29:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-11 05:29:58 +0000 |
| commit | b7bd34886fb39401b6e38ad97634655a0d025902 (patch) | |
| tree | 252343c1f54e735f1ae63bb55f866efa246e6855 /src | |
| parent | 3d4a67d1ed392dd4788b84259d3d7ed7d694edf7 (diff) | |
| parent | 4d63cfce55fa71eb208467310277bebc828be07d (diff) | |
| download | android_packages_apps_ExactCalculator-b7bd34886fb39401b6e38ad97634655a0d025902.tar.gz android_packages_apps_ExactCalculator-b7bd34886fb39401b6e38ad97634655a0d025902.tar.bz2 android_packages_apps_ExactCalculator-b7bd34886fb39401b6e38ad97634655a0d025902.zip | |
Merge "Announce when formula has been completely deleted." into mnc-dr-dev
Diffstat (limited to 'src')
| -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) { |