Merge "Fix in vertical measurement in text lines with different text sizes" (9d5055a2) · Commits · e / os / android_frameworks_base

core/java/android/text/TextLine.java

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -662,6 +662,25 @@ class TextLine {
	}		}
	}		}

			/**
			* @param wp
			*/
			private static void expandMetricsFromPaint(FontMetricsInt fmi, TextPaint wp) {
			final int previousTop = fmi.top;
			final int previousAscent = fmi.ascent;
			final int previousDescent = fmi.descent;
			final int previousBottom = fmi.bottom;
			final int previousLeading = fmi.leading;

			wp.getFontMetricsInt(fmi);

			fmi.top = Math.min(fmi.top, previousTop);
			fmi.ascent = Math.min(fmi.ascent, previousAscent);
			fmi.descent = Math.max(fmi.descent, previousDescent);
			fmi.bottom = Math.max(fmi.bottom, previousBottom);
			fmi.leading = Math.max(fmi.leading, previousLeading);
			}

	/**		/**
	* Utility function for measuring and rendering text. The text must		* Utility function for measuring and rendering text. The text must
	* not include a tab or emoji.		* not include a tab or emoji.
	@@ -703,7 +722,7 @@ class TextLine {
	}		}

	if (fmi != null) {		if (fmi != null) {
	wp.getFontMetricsInt(fmi);		expandMetricsFromPaint(fmi, wp);
	}		}

	if (c != null) {		if (c != null) {

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1818,6 +1818,7 @@ public class Paint {
	nativeGetCharArrayBounds(mNativePaint, text, index, count, bounds);		nativeGetCharArrayBounds(mNativePaint, text, index, count, bounds);
	}		}

			@Override
	protected void finalize() throws Throwable {		protected void finalize() throws Throwable {
	finalizer(mNativePaint);		finalizer(mNativePaint);
	}		}