am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" (537be409) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -5163,12 +5163,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		final int width = mRight - mLeft;
		final int padding = getCompoundPaddingLeft() + getCompoundPaddingRight();
		final float dx = mLayout.getLineRight(0) - (width - padding);
		canvas.translate(isLayoutRtl ? -dx : +dx, 0.0f);
		canvas.translate(layout.getParagraphDirection(0) * dx, 0.0f);
		}

		if (mMarquee != null && mMarquee.isRunning()) {
		final float dx = -mMarquee.getScroll();
		canvas.translate(isLayoutRtl ? -dx : +dx, 0.0f);
		canvas.translate(layout.getParagraphDirection(0) * dx, 0.0f);
		}
		}

		@@ -5182,8 +5182,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}

		if (mMarquee != null && mMarquee.shouldDrawGhost()) {
		final int dx = (int) mMarquee.getGhostOffset();
		canvas.translate(isLayoutRtl ? -dx : dx, 0.0f);
		final float dx = mMarquee.getGhostOffset();
		canvas.translate(layout.getParagraphDirection(0) * dx, 0.0f);
		layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical);
		}