Use AlignedTextView for History Formulas.
Fixes: 33109121
Change-Id: Ida281a42669f166ee051521a43545826a12af782
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index f3e05c3..3baaf73 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -40,7 +40,7 @@
android:overScrollMode="never"
android:scrollbars="none">
- <com.android.calculator2.CalculatorFormula
+ <com.android.calculator2.AlignedTextView
android:id="@+id/history_formula"
style="@style/HistoryItemTextStyle"
android:layout_width="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 25a3cd0..773c5a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -46,6 +46,7 @@
</style>
<style name="HistoryItemTextStyle" parent="DisplayTextStyle">
+ <item name="android:layout_gravity">bottom|end</item>
<item name="android:paddingTop">@dimen/history_item_text_padding_top</item>
<item name="android:paddingBottom">@dimen/history_item_text_padding_bottom</item>
<item name="android:paddingStart">@dimen/history_item_text_padding_start</item>
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
}
diff --git a/src/com/android/calculator2/HistoryAdapter.java b/src/com/android/calculator2/HistoryAdapter.java
index cc2f7e1..56399c7 100644
--- a/src/com/android/calculator2/HistoryAdapter.java
+++ b/src/com/android/calculator2/HistoryAdapter.java
@@ -140,7 +140,7 @@
public static class ViewHolder extends RecyclerView.ViewHolder {
private TextView mDate;
- private CalculatorFormula mFormula;
+ private AlignedTextView mFormula;
private CalculatorResult mResult;
public ViewHolder(View v, int viewType) {
@@ -149,11 +149,11 @@
return;
}
mDate = (TextView) v.findViewById(R.id.history_date);
- mFormula = (CalculatorFormula) v.findViewById(R.id.history_formula);
+ mFormula = (AlignedTextView) v.findViewById(R.id.history_formula);
mResult = (CalculatorResult) v.findViewById(R.id.history_result);
}
- public CalculatorFormula getFormula() {
+ public AlignedTextView getFormula() {
return mFormula;
}