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

Commit 4cf435df authored by Gilles Debunne's avatar Gilles Debunne
Browse files

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

This reverts commit 32ea4ffd.

This change introduces an ANR in AutoComplete text view. There is
an infinite loop when the suggestion TextView is measured.

Reverted to fix the ANR, opening a new bug for the ellipsize.

Bug 3315813, 3320375, 3318059

Change-Id: I1872116ca1f39324ed4500d338bafac7e0d195ec
parent 78526012

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