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

Commit 4bbcae7e authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev

parents d8efe424 d3efd692

libs/hwui/DisplayListRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ public: 
        if (scaleY != mScaleY) {

            mScaleY = scaleY;

            mMatrixDirty = true;

            if (ALMOST_EQUAL(mScaleX, 1) && ALMOST_EQUAL(mScaleY, 1)) {

            if (mScaleX == 1.0f && mScaleY == 1.0f) {

                mMatrixFlags &= ~SCALE;

            } else {

                mMatrixFlags |= SCALE;

libs/hwui/Matrix.cpp

+4 −7
Original line number Diff line number Diff line
@@ -56,16 +56,13 @@ void Matrix4::loadIdentity() { 
}



bool Matrix4::changesBounds() {

    return !(ALMOST_EQUAL(data[0], 1.0f) && ALMOST_EQUAL(data[1], 0.0f) &&

             ALMOST_EQUAL(data[2], 0.0f) && ALMOST_EQUAL(data[4], 0.0f) &&

             ALMOST_EQUAL(data[5], 1.0f) && ALMOST_EQUAL(data[6], 0.0f) &&

             ALMOST_EQUAL(data[8], 0.0f) && ALMOST_EQUAL(data[9], 0.0f) &&

             ALMOST_EQUAL(data[10], 1.0f));

    return !(data[0] == 1.0f && data[1] == 0.0f && data[2] == 0.0f && data[4] == 0.0f &&

             data[5] == 1.0f && data[6] == 0.0f && data[8] == 0.0f && data[9] == 0.0f &&

             data[10] == 1.0f);

}



bool Matrix4::isPureTranslate() {

    return mSimpleMatrix &&

            ALMOST_EQUAL(data[kScaleX], 1.0f) && ALMOST_EQUAL(data[kScaleY], 1.0f);

    return mSimpleMatrix && data[kScaleX] == 1.0f && data[kScaleY] == 1.0f;

}



bool Matrix4::isSimple() {