commit 36147983cb821ede03f569a562133a08cac9bcdf
author Annie Chin <afchin@google.com> Thu Dec 01 15:07:34 2016 -0800
committer Annie Chin <afchin@google.com> Mon Dec 05 15:26:29 2016 -0800
tree 42a6ee6c24925d1cb059798bc6f63ec4d17283f9
parent f1c92ca966b0ad3cd52c50160117e33706f2a361

Implement grouped headers.

Fixes: 32943152
Fixes: 33203390
Fixes: 33105914

-Add divider
-Adjust padding to better match spec
-Make HistoryFormula/Result padding match DisplayFormula/Result padding

Change-Id: I5e5a7e61079b6d1367bf61f4c88dd79555f4bcb7

src/com/android/calculator2/DragController.java

diff --git a/src/com/android/calculator2/DragController.java b/src/com/android/calculator2/DragController.java
index 1c31767..ed983c5 100644
--- a/src/com/android/calculator2/DragController.java
+++ b/src/com/android/calculator2/DragController.java
@@ -51,6 +51,9 @@
     private int mResultStartColor;
     private int mResultEndColor;
 
+    // The padding at the bottom of the RecyclerView itself.
+    private int mBottomPaddingHeight;
+
     private boolean mAnimationInitialized;
 
     private AnimationController mAnimationController;
@@ -97,8 +100,11 @@
             final AlignedTextView formula = vh.getFormula();
             final CalculatorResult result = vh.getResult();
             final TextView date = vh.getDate();
+            final View divider = vh.getDivider();
 
             if (!mAnimationInitialized) {
+                mBottomPaddingHeight = recyclerView.getPaddingBottom();
+
                 mAnimationController.initializeScales(formula, result);
 
                 mAnimationController.initializeColorAnimators(formula, result);
@@ -140,6 +146,7 @@
                         mResultEndColor));
 
                 date.setTranslationY(mAnimationController.getDateTranslationY(yFraction));
+                divider.setTranslationY(mAnimationController.getDateTranslationY(yFraction));
             }
         } else if (EvaluatorStateUtils.isDisplayEmpty(mEvaluator)) {
             // There is no current expression but we still need to collect information
@@ -243,7 +250,8 @@
             // difference in result height.
             mFormulaTranslationY =
                     mDisplayFormula.getPaddingBottom() - formula.getPaddingBottom()
-                            + mDisplayResult.getHeight() - result.getHeight();
+                            + mDisplayResult.getHeight() - result.getHeight()
+                            - mBottomPaddingHeight;
 
         }
 
@@ -254,7 +262,8 @@
 
         public void initializeResultTranslationY(CalculatorResult result) {
             // Baseline of result moves by the difference in result bottom padding.
-            mResultTranslationY = mDisplayResult.getPaddingBottom() - result.getPaddingBottom();
+            mResultTranslationY = mDisplayResult.getPaddingBottom() - result.getPaddingBottom()
+            - mBottomPaddingHeight;
         }
 
         public void initializeResultTranslationX(CalculatorResult result) {
@@ -322,7 +331,8 @@
             // Baseline of formula moves by the difference in formula bottom padding and the
             // difference in the result height.
             mFormulaTranslationY = mDisplayFormula.getPaddingBottom() - formula.getPaddingBottom()
-                            + mDisplayResult.getHeight() - result.getHeight();
+                            + mDisplayResult.getHeight() - result.getHeight()
+                            - mBottomPaddingHeight;
         }
 
         @Override
@@ -334,8 +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();
+            mResultTranslationY = mDisplayResult.getBottom() - result.getBottom()
+                   + mDisplayResult.getPaddingBottom() - result.getPaddingBottom()
+                   - mBottomPaddingHeight;
         }
 
         @Override
@@ -447,7 +458,7 @@
 
         @Override
         public float getHistoryElementTranslationY(float yFraction) {
-            return -mDisplayHeight * (1 - yFraction);
+            return -mDisplayHeight * (1 - yFraction) - mBottomPaddingHeight;
         }
 
         @Override