commit fe7a4103f44db1e0e9e8ec0aca049c77e733edbe
author Annie Chin <afchin@google.com> Fri Dec 02 16:21:04 2016 -0800
committer Annie Chin <afchin@google.com> Mon Dec 05 15:40:29 2016 -0800
tree d6a5af34861c22ee7217a74bbace9067c9aba03d
parent aa7dca29079b7d692dc6bc7a54d5882126500c4b

Result pulldown should account for TranslationY.

Fixes: 33106867

Change-Id: Ib9402192e4f70439c109e0223a612be4293aa8d3

src/com/android/calculator2/DragController.java

diff --git a/src/com/android/calculator2/DragController.java b/src/com/android/calculator2/DragController.java
index ed983c5..413df4c 100644
--- a/src/com/android/calculator2/DragController.java
+++ b/src/com/android/calculator2/DragController.java
@@ -40,7 +40,7 @@
     private float mFormulaScale;
     private float mResultScale;
 
-    private int mResultTranslationY;
+    private float mResultTranslationY;
     private int mResultTranslationX;
 
     private int mDisplayHeight;
@@ -344,9 +344,9 @@
         @Override
         public void initializeResultTranslationY(CalculatorResult result) {
             // Baseline of result moves by the difference in result bottom padding.
-            mResultTranslationY = mDisplayResult.getBottom() - result.getBottom()
-                   + mDisplayResult.getPaddingBottom() - result.getPaddingBottom()
-                   - mBottomPaddingHeight;
+            mResultTranslationY =  mDisplayResult.getPaddingBottom() - result.getPaddingBottom()
+                    - mDisplayResult.getTranslationY()
+                    - mBottomPaddingHeight;
         }
 
         @Override