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

Commit ed4127cc authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix for ellipsized text that has two lines at maximum.""

parents 9c173dbc 4cf435df

core/java/android/text/StaticLayout.java

+90 −92
Original line number Diff line number Diff line
@@ -361,8 +361,7 @@ public class StaticLayout extends Layout 
                            if (fitbottom > okbottom)

                                okbottom = fitbottom;

                        }

                    } else {

                        if (breakOnlyAtSpaces) {

                    } else if (breakOnlyAtSpaces) {

                        if (ok != here) {

                            // Log.e("text", "output ok " + here + " to " +ok);
@@ -458,7 +457,6 @@ public class StaticLayout extends Layout 


                            here = here + 1;

                        }

                        }



                        if (here < spanStart) {

                            // didn't output all the text for this span