summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristine Franks <christyfranks@google.com>2016-11-23 12:28:26 -0800
committerChristine Franks <christyfranks@google.com>2016-11-23 12:28:26 -0800
commitff8e0d8a422920bce7c8af3b7a89f1aabd401b83 (patch)
tree4494bf3ea99a94bdddd4d77b932879d865fb9ca3 /src
parent450de8a974e75e6538633c95ec7af7bafff5ad46 (diff)
downloadandroid_packages_apps_ExactCalculator-ff8e0d8a422920bce7c8af3b7a89f1aabd401b83.tar.gz
android_packages_apps_ExactCalculator-ff8e0d8a422920bce7c8af3b7a89f1aabd401b83.tar.bz2
android_packages_apps_ExactCalculator-ff8e0d8a422920bce7c8af3b7a89f1aabd401b83.zip
Fix memory operations for history
Bug: 33106224 Test: manual - M+ and M- work on history entries Change-Id: I38fb002265c4c95982f0c02af701cf547573cb83
Diffstat (limited to 'src')
-rw-r--r--src/com/android/calculator2/CalculatorResult.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/calculator2/CalculatorResult.java b/src/com/android/calculator2/CalculatorResult.java
index 0b399c4..a677b5e 100644
--- a/src/com/android/calculator2/CalculatorResult.java
+++ b/src/com/android/calculator2/CalculatorResult.java
@@ -413,14 +413,14 @@ public class CalculatorResult extends AlignedTextView implements MenuItem.OnMenu
* Add the result to the value currently in memory.
*/
public void onMemoryAdd() {
- mEvaluator.addToMemory(Evaluator.MAIN_INDEX);
+ mEvaluator.addToMemory(mIndex);
}
/**
* Subtract the result from the value currently in memory.
*/
public void onMemorySubtract() {
- mEvaluator.subtractFromMemory(Evaluator.MAIN_INDEX);
+ mEvaluator.subtractFromMemory(mIndex);
}
/**