Merge "Fix for ellipsized text that has two lines at maximum." (9a99244a) · Commits · e / os / android_frameworks_base

core/java/android/text/StaticLayout.java

+92 −90

Original line number	Diff line number	Diff line
		@@ -361,7 +361,8 @@ 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);

		@@ -457,6 +458,7 @@ public class StaticLayout extends Layout

		here = here + 1;
		}
		}

		if (here < spanStart) {
		// didn't output all the text for this span