diff options
| author | Annie Chin <afchin@google.com> | 2017-02-09 08:53:18 -0800 |
|---|---|---|
| committer | Annie Chin <afchin@google.com> | 2017-02-09 10:16:26 -0800 |
| commit | a3a3375f7b2ad00ff993f53eda8c1583cce61e02 (patch) | |
| tree | e78d0dcf354ef25646df24d5476e740ae4d9b0be | |
| parent | cd744f7a2b0373019175195703c50cac81201169 (diff) | |
| download | ExactCalculator-a3a3375f7b2ad00ff993f53eda8c1583cce61e02.tar.gz | |
Do not evaluate when in RESULT state.
Fixes: 35162435
This prevents requireResult from being called a second time (and
duplicating history entries) during a multiwindow change.
Change-Id: I145d4e770c3e5ac8b8554ea1a2a577a34369899d
| -rw-r--r-- | src/com/android/calculator2/Calculator.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java index 1516a11..d184344 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -918,9 +918,10 @@ public class Calculator extends Activity mResultText.onEvaluate(index, initDisplayPrec, msd, leastDigPos, truncatedWholeNumber); if (mCurrentState != CalculatorState.INPUT) { - // In EVALUATE, INIT, or INIT_FOR_RESULT state. + // In EVALUATE, INIT, RESULT, or INIT_FOR_RESULT state. onResult(mCurrentState == CalculatorState.EVALUATE /* animate */, - mCurrentState == CalculatorState.INIT_FOR_RESULT /* previously preserved */); + mCurrentState == CalculatorState.INIT_FOR_RESULT + || mCurrentState == CalculatorState.RESULT /* previously preserved */); } } |