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

Commit 4c5ea10c authored by Raph Levien's avatar Raph Levien Committed by Android (Google) Code Review
Browse files

Merge "Ensure layout in getExtendedPadding calls" into lmp-dev

parents 980d4663 463cf1ae

core/java/android/widget/TextView.java

+8 −0
Original line number Diff line number Diff line
@@ -1861,6 +1861,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            return getCompoundPaddingTop();

        }



        if (mLayout == null) {

            assumeLayout();

        }



        if (mLayout.getLineCount() <= mMaximum) {

            return getCompoundPaddingTop();

        }
@@ -1894,6 +1898,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            return getCompoundPaddingBottom();

        }



        if (mLayout == null) {

            assumeLayout();

        }



        if (mLayout.getLineCount() <= mMaximum) {

            return getCompoundPaddingBottom();

        }