Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3a3375f authored by Annie Chin's avatar Annie Chin
Browse files

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
parent cd744f7a

src/com/android/calculator2/Calculator.java

+3 −2
Original line number Diff line number Diff line
@@ -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 */);

        }

    }