From 15a853dd8410b2b690c3907860b6631c2d814928 Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Tue, 23 Jun 2015 18:32:02 -0700 Subject: Restore original scroll position on = Bug: 22041219 Restore default scrolling position when hitting enter after scrolling an instant display result. We could instead preserve the position and fix the display logic to no longer get confused by a non-default initial position. But this feels more natural to me. Change-Id: I43bb936b5bb1b5af7a7befb90fdfc0f745fb7729 --- src/com/android/calculator2/Evaluator.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/com/android/calculator2/Evaluator.java') 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); } } -- cgit v1.2.3