diff options
author | Hans Boehm <hboehm@google.com> | 2015-08-19 12:32:56 -0700 |
---|---|---|
committer | Hans Boehm <hboehm@google.com> | 2015-10-09 23:19:23 +0000 |
commit | 4d63cfce55fa71eb208467310277bebc828be07d (patch) | |
tree | 44c0344c0086f9ac9692c0d7ab8369e61bb64cff /src | |
parent | 51fc9bddf33616aa8abaf4a37889efa90679e445 (diff) | |
download | android_packages_apps_ExactCalculator-4d63cfce55fa71eb208467310277bebc828be07d.tar.gz android_packages_apps_ExactCalculator-4d63cfce55fa71eb208467310277bebc828be07d.tar.bz2 android_packages_apps_ExactCalculator-4d63cfce55fa71eb208467310277bebc828be07d.zip |
Announce when formula has been completely deleted.
Bug: 23224425
Bug: 23695835
This adds a "cleared" announcement when last token/character is deleted.
Also change the existing "clear" announcements to "cleared".
Improve the comments for desc_clr and desc_del to address prior
misunderstandings.
Improve xml comment formatting consistency.
Change-Id: Ibe5197ceac132b73d72f8ace3982238249f5e82b
(cherry picked from commit db6f99979b713e491ace2f0cd9315e5c1616269b)
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 4eecb50..86953ef 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) { |