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

Commit 066460f3 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Fix for testAccessTransformationMethod cts test. 

Single line textView should impose their number of lines and their
transformation method.

Bug 3289818

Change-Id: If1f1252ded1250e2aff85f1c615cc2e17026ba1d
parent 0ad460b0

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -912,9 +912,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        setCompoundDrawablePadding(drawablePadding);



        // Same as setSingleLine(), but make sure the transformation method and the maximum number

        // of lines of height (for multi-line only) are unchanged.

        // of lines of height are unchanged for multi-line TextViews.

        setInputTypeSingleLine(singleLine);

        applySingleLine(singleLine, false, false);

        applySingleLine(singleLine, singleLine, singleLine);



        if (singleLine && mInput == null && ellipsize < 0) {

                ellipsize = 3; // END