commit 28589dc59b81a6ea18fda9d23e36dc412f09df58
author Annie Chin <afchin@google.com> Thu Jun 09 17:50:51 2016 -0700
committer Annie Chin <afchin@google.com> Mon Jun 13 12:26:40 2016 -0700
tree 313915f01e58abe89fe625b1d743eff7d790f53b
parent 79f273c2b38e4e0acda4be111dfdd0b54d150014

Calculator multiwindow support R3.

Bug: 27839606
Bug: 29247633
Bug: 29234784
Bug: 29229453

Change-Id: Ie27efe4a24b81a00762eee15fbfc035253f8e3c9

src/com/android/calculator2/Calculator.java

diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 30a2785..f51f3fb 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -920,13 +920,15 @@
 
         // Calculate the necessary translations so the result takes the place of the formula and
         // the formula moves off the top of the screen.
+        final float resultTranslationY = (mFormulaContainer.getBottom() - mResultText.getBottom())
+                - (mFormulaText.getPaddingBottom() - mResultText.getPaddingBottom());
+        float formulaTranslationY = -mFormulaContainer.getBottom();
         if (mOneLine) {
             // Position the result text.
             mResultText.setY(mResultText.getBottom());
+            formulaTranslationY = -(findViewById(R.id.toolbar).getBottom()
+                    + mFormulaContainer.getBottom());
         }
-        final float resultTranslationY = (mFormulaContainer.getBottom() - mResultText.getBottom())
-                - (mFormulaText.getPaddingBottom() - mResultText.getPaddingBottom());
-        final float formulaTranslationY = -mFormulaContainer.getBottom();
 
         // Change the result's textColor to match the formula.
         final int formulaTextColor = mFormulaText.getCurrentTextColor();