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

Commit d49a86ce authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Fix BigText transitions" into nyc-dev 

am: 2ab4f451

* commit '2ab4f451':
  Fix BigText transitions

Change-Id: I4705bacc68842c2a7ed178689e8efa53abc8e235
parents 37087ad7 2ab4f451

packages/SystemUI/src/com/android/systemui/statusbar/notification/TextViewTransformState.java

+5 −1
Original line number Diff line number Diff line
@@ -47,12 +47,16 @@ public class TextViewTransformState extends TransformState { 
                int ownEllipsized = getEllipsisCount();

                int otherEllipsized = otherTvs.getEllipsisCount();

                return ownEllipsized == otherEllipsized

                        && mText.getHeight() == otherTvs.mText.getHeight();

                        && getInnerHeight(mText) == getInnerHeight(otherTvs.mText);

            }

        }

        return super.sameAs(otherState);

    }



    private int getInnerHeight(TextView text) {

        return text.getHeight() - text.getPaddingTop() - text.getPaddingBottom();

    }



    private int getEllipsisCount() {

        Layout l = mText.getLayout();

        if (l != null) {