From b13daf1050757fe3c69c2f0246de33e7e69b5fa9 Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Mon, 27 Jul 2015 18:33:12 -0700 Subject: Evaluator.java and CalculatorExpr.java cleanup Bug: 24811759 Bug: 21960281 Bug: 22047258 No substantive changes. Reformat to 100 columns. Correct and/or remove obsolete comments and occasional bits of clearly dead code. Better follow coding conventions. Rename variables for both internal consistency and consistency with other files. This included a few renamings in Calculator.java and CalculatorResult.java, and a comment fix in CalculatorResult.java. Rename public fields per coding convention. Correctly declare more nested classes static. Document FIXME issues to be addressed in followup CL. This includes a careful look at the msd computations. I cannot construct any failing examples, but I also cannot currently construct a correctness argument. Change-Id: I5c67493eeb7730edb4b3ca3ba1cb8b7d2b87dbc2 (cherry picked from commit abe2862bc936dd083b5ba19b68c68ea4cc44b2f6) --- src/com/android/calculator2/Calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/com/android/calculator2/Calculator.java') diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java index 4eecb50..035f5b9 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -991,7 +991,7 @@ public class Calculator extends Activity setState(CalculatorState.INPUT); mEvaluator.clear(); } - mEvaluator.addSaved(); + mEvaluator.appendSaved(); redisplayAfterFormulaChange(); } else { addChars(item.coerceToText(this).toString(), false); -- cgit v1.2.3