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

Commit 273dcbf0 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

Change-Id: I6c0070008432277fbb6ee6ce010c4933e2a7d735
parents a51e0d3b ae90cfcc

core/java/android/widget/TextView.java

+2 −1
Original line number Diff line number Diff line
@@ -8409,7 +8409,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) {