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

Commit 390a4d6c authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev am: ae90cfcc 

am: 273dcbf0

Change-Id: Ic03051c0a9d491337d9606e082ad83ecb61bd1c7
parents 3266b45b 273dcbf0

core/java/android/widget/TextView.java

+2 −1
Original line number Diff line number Diff line
@@ -8433,7 +8433,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


        if (mMaxMode != LINES) {

            desired = Math.min(desired, mMaximum);

        } else if (cap && linecount > mMaximum && layout instanceof DynamicLayout) {

        } else if (cap && linecount > mMaximum && (layout instanceof DynamicLayout

                || layout instanceof BoringLayout)) {

            desired = layout.getLineTop(mMaximum);



            if (dr != null) {