Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ace4eb8 authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Always calculate textSize in CalculatorText#onMeasure 

Bug: 26934901

- Don't gate the minimum height and variable text size calculations
  based on the width constraint. That constraint may remain constant
  even though other configuration parameters are changing. It's
  sufficient to just not invoke the text size change listener in
  onMeasure to prevent unnecessary animations.
- Also suppressed unchecked cast warning in CalculatorExpr.

Change-Id: Ia402cdabdf7b0864fcbb3017ab85bb4038409da8
parent 9e7e5028

src/com/android/calculator2/CalculatorExpr.java

+2 −2
Original line number Diff line number Diff line
@@ -619,9 +619,9 @@ class CalculatorExpr { 
     * The caller supplies the value, degree mode, and short string representation, which must

     * have been previously computed.  Thus this is guaranteed to terminate reasonably quickly.

     */

    public CalculatorExpr abbreviate(CR val, BoundedRational ratVal,

                              boolean dm, String sr) {

    public CalculatorExpr abbreviate(CR val, BoundedRational ratVal, boolean dm, String sr) {

        CalculatorExpr result = new CalculatorExpr();

        @SuppressWarnings("unchecked")

        Token t = new PreEval(val, ratVal, new CalculatorExpr((ArrayList<Token>) mExpr.clone()),

                new EvalContext(dm, mExpr.size()), sr);

        result.mExpr.add(t);

src/com/android/calculator2/CalculatorText.java

+12 −14
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ public class CalculatorText extends AlignedTextView implements View.OnLongClickL 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        // Re-calculate our textSize based on new width.

        final int width = MeasureSpec.getSize(widthMeasureSpec)

                - getPaddingLeft() - getPaddingRight();

        if (mWidthConstraint != width) {

            mWidthConstraint = width;



        if (!isLaidOut()) {

            // Prevent shrinking/resizing with our variable textSize.

            setTextSizeInternal(TypedValue.COMPLEX_UNIT_PX, mMaximumTextSize,
@@ -152,8 +146,12 @@ public class CalculatorText extends AlignedTextView implements View.OnLongClickL 
                    + getCompoundPaddingTop());

        }



            setTextSizeInternal(TypedValue.COMPLEX_UNIT_PX, getVariableTextSize(getText()),

                    false);

        // Re-calculate our textSize based on new width.

        mWidthConstraint = MeasureSpec.getSize(widthMeasureSpec)

                - getPaddingLeft() - getPaddingRight();

        final float textSize = getVariableTextSize(getText());

        if (getTextSize() != textSize) {

            setTextSizeInternal(TypedValue.COMPLEX_UNIT_PX, textSize, false /* notifyListener */);

        }



        super.onMeasure(widthMeasureSpec, heightMeasureSpec);