commit 8149c8c2f02a3a6aae34d8d8b3bc67ce0f56378c
author Annie Chin <afchin@google.com> Mon Nov 28 13:44:09 2016 -0800
committer Annie Chin <afchin@google.com> Mon Nov 28 13:45:08 2016 -0800
tree 536a293ce6cf8825d2d8f18a64cbe2d3e5ccf6eb
parent 94c1bd954266677f3e6bdd00741eaf4db6881c18

Use AlignedTextView for History Formulas.

Fixes: 33109121

Change-Id: Ida281a42669f166ee051521a43545826a12af782

src/com/android/calculator2/DragController.java

diff --git a/src/com/android/calculator2/DragController.java b/src/com/android/calculator2/DragController.java
index 9b40ecc..3160fbf 100644
--- a/src/com/android/calculator2/DragController.java
+++ b/src/com/android/calculator2/DragController.java
@@ -85,7 +85,7 @@
             recyclerView.setVisibility(View.VISIBLE);
         }
         if (vh != null && !EvaluatorStateUtils.isDisplayEmpty(mEvaluator)) {
-            final CalculatorFormula formula = vh.getFormula();
+            final AlignedTextView formula = vh.getFormula();
             final CalculatorResult result = vh.getResult();
             final TextView date = vh.getDate();
 
@@ -164,11 +164,11 @@
 
         void initializeDisplayHeight();
 
-        void initializeScales(CalculatorFormula formula, CalculatorResult result);
+        void initializeScales(AlignedTextView formula, CalculatorResult result);
 
-        void initializeFormulaTranslationX(CalculatorFormula formula);
+        void initializeFormulaTranslationX(AlignedTextView formula);
 
-        void initializeFormulaTranslationY(CalculatorFormula formula, CalculatorResult result);
+        void initializeFormulaTranslationY(AlignedTextView formula, CalculatorResult result);
 
         void initializeResultTranslationX(CalculatorResult result);
 
@@ -204,12 +204,12 @@
             // no-op
         }
 
-        public void initializeScales(CalculatorFormula formula, CalculatorResult result) {
+        public void initializeScales(AlignedTextView formula, CalculatorResult result) {
             // Calculate the scale for the text
             mFormulaScale = (mDisplayFormula.getTextSize() * 1.0f) / formula.getTextSize();
         }
 
-        public void initializeFormulaTranslationY(CalculatorFormula formula,
+        public void initializeFormulaTranslationY(AlignedTextView formula,
                 CalculatorResult result) {
             // Baseline of formula moves by the difference in formula bottom padding and the
             // difference in result height.
@@ -219,7 +219,7 @@
 
         }
 
-        public void initializeFormulaTranslationX(CalculatorFormula formula) {
+        public void initializeFormulaTranslationX(AlignedTextView formula) {
             // Right border of formula moves by the difference in formula end padding.
             mFormulaTranslationX = mDisplayFormula.getPaddingEnd() - formula.getPaddingEnd();
         }
@@ -281,7 +281,7 @@
     public class ResultAnimationController extends AnimationController
             implements DragController.AnimateTextInterface {
         @Override
-        public void initializeScales(CalculatorFormula formula, CalculatorResult result) {
+        public void initializeScales(AlignedTextView formula, CalculatorResult result) {
             final float textSize = mDisplayResult.getTextSize() * mDisplayResult.getScaleX();
             mResultScale = textSize / result.getTextSize();
 
@@ -289,7 +289,7 @@
         }
 
         @Override
-        public void initializeFormulaTranslationY(CalculatorFormula formula,
+        public void initializeFormulaTranslationY(AlignedTextView formula,
                 CalculatorResult result) {
             // Baseline of formula moves by the difference in formula bottom padding and the
             // difference in the result height.
@@ -298,7 +298,7 @@
         }
 
         @Override
-        public void initializeFormulaTranslationX(CalculatorFormula formula) {
+        public void initializeFormulaTranslationX(AlignedTextView formula) {
             // Right border of formula moves by the difference in formula end padding.
             mFormulaTranslationX = mDisplayFormula.getPaddingEnd() - formula.getPaddingEnd();
         }
@@ -372,18 +372,18 @@
         }
 
         @Override
-        public void initializeScales(CalculatorFormula formula, CalculatorResult result) {
+        public void initializeScales(AlignedTextView formula, CalculatorResult result) {
             // no-op
         }
 
         @Override
-        public void initializeFormulaTranslationY(CalculatorFormula formula,
+        public void initializeFormulaTranslationY(AlignedTextView formula,
                 CalculatorResult result) {
             // no-op
         }
 
         @Override
-        public void initializeFormulaTranslationX(CalculatorFormula formula) {
+        public void initializeFormulaTranslationX(AlignedTextView formula) {
             // no-op
         }