From 9d99863752ee477c392eec6ddeaa9ddbac963213 Mon Sep 17 00:00:00 2001 From: serso Date: Thu, 12 Feb 2015 12:18:34 +0100 Subject: [PATCH] android-calculatorpp-114: "Calculator while typing" option is ignored Fixes#114 --- .../org/solovyev/android/calculator/AndroidCalculator.java | 5 +++++ .../java/org/solovyev/android/calculator/Calculator.java | 2 ++ .../org/solovyev/android/calculator/CalculatorImpl.java | 5 +++++ .../android/calculator/CalculatorSpecialButton.java | 7 +++++++ 4 files changed, 19 insertions(+) diff --git a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java index 021f886b..adadb182 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculator.java @@ -104,6 +104,11 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S return calculator.evaluate(operation, expression, sequenceId); } + @Override + public boolean isCalculateOnFly() { + return calculator.isCalculateOnFly(); + } + @Override public boolean isConversionPossible(@Nonnull Generic generic, @Nonnull NumeralBase from, @Nonnull NumeralBase to) { return calculator.isConversionPossible(generic, from, to); diff --git a/core/src/main/java/org/solovyev/android/calculator/Calculator.java b/core/src/main/java/org/solovyev/android/calculator/Calculator.java index 70167194..51bb6718 100644 --- a/core/src/main/java/org/solovyev/android/calculator/Calculator.java +++ b/core/src/main/java/org/solovyev/android/calculator/Calculator.java @@ -64,6 +64,8 @@ public interface Calculator extends CalculatorEventContainer, HistoryControl