summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2015-06-24 05:23:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-24 05:23:30 +0000
commit9decce28d47586397abcd327c306df0b8469c19d (patch)
treea0da3ba6c88d9e3f5cd2e67b8a0214459acc3750
parentd5ba5a894e6033f39985e7a77c7c3fc726a0b991 (diff)
parent15a853dd8410b2b690c3907860b6631c2d814928 (diff)
downloadandroid_packages_apps_ExactCalculator-9decce28d47586397abcd327c306df0b8469c19d.tar.gz
android_packages_apps_ExactCalculator-9decce28d47586397abcd327c306df0b8469c19d.tar.bz2
android_packages_apps_ExactCalculator-9decce28d47586397abcd327c306df0b8469c19d.zip
am 15a853dd: Restore original scroll position on =
* commit '15a853dd8410b2b690c3907860b6631c2d814928': Restore original scroll position on =
-rw-r--r--src/com/android/calculator2/Evaluator.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/calculator2/Evaluator.java b/src/com/android/calculator2/Evaluator.java
index 666790a..081f843 100644
--- a/src/com/android/calculator2/Evaluator.java
+++ b/src/com/android/calculator2/Evaluator.java
@@ -818,8 +818,11 @@ class Evaluator {
// Notify immediately, reusing existing result.
int dotPos = mCache.indexOf('.');
String truncatedWholePart = mCache.substring(0, dotPos);
- int leastDigPos = getLsd(mRatVal, mCache, dotPos);
- mCalculator.onEvaluate(mLastDigs, getMsd(), leastDigPos, truncatedWholePart);
+ int leastDigOffset = getLsd(mRatVal, mCache, dotPos);
+ int msdIndex = getMsd();
+ int preferredPrecOffset = getPreferredPrec(mCache, msdIndex, leastDigOffset);
+ mCalculator.onEvaluate(preferredPrecOffset, msdIndex, leastDigOffset,
+ truncatedWholePart);
}
}