Display error message onEquals with invalid expression
Bug: 30415698
It's important for a11y that we provide some indication that the
evaluation of the expression failed (in addition to changing the color
of the invalid part of the expression).
Change-Id: I8caf3e01bb5bd9102b739c445036b6ca6cdaf3c8
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index bdaddef..e2c16b3 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -777,11 +777,12 @@
private void onEquals() {
// Ignore if in non-INPUT state, or if there are no operators.
- if (mCurrentState == CalculatorState.INPUT && mEvaluator.getExpr().hasInterestingOps()) {
- setState(CalculatorState.EVALUATE);
+ if (mCurrentState == CalculatorState.INPUT) {
if (haveUnprocessed()) {
+ setState(CalculatorState.EVALUATE);
onError(R.string.error_syntax);
- } else {
+ } else if (mEvaluator.getExpr().hasInterestingOps()) {
+ setState(CalculatorState.EVALUATE);
mEvaluator.requireResult();
}
}