Use AlignedTextView for History Formulas. (8149c8c2) · Commits · e / os / android_packages_apps_ExactCalculator

res/layout/history_item.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

res/values/styles.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -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>

src/com/android/calculator2/DragController.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ public final class DragController {
		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 @@ public final class DragController {

		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 @@ public final class DragController {
		// 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 final class DragController {

		}

		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 final class DragController {
		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 @@ public final class DragController {
		}

		@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 @@ public final class DragController {
		}

		@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 @@ public final class DragController {
		}

		@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
		}

src/com/android/calculator2/HistoryAdapter.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold
		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 @@ public class HistoryAdapter extends RecyclerView.Adapter<HistoryAdapter.ViewHold
		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;
		}