Merge "Make more TextView RTL APIs public" (0c245fb2) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -27645,9 +27645,12 @@ package android.widget {
		method public final int getAutoLinkMask();
		method public int getCompoundDrawablePadding();
		method public android.graphics.drawable.Drawable[] getCompoundDrawables();
		method public android.graphics.drawable.Drawable[] getCompoundDrawablesRelative();
		method public int getCompoundPaddingBottom();
		method public int getCompoundPaddingEnd();
		method public int getCompoundPaddingLeft();
		method public int getCompoundPaddingRight();
		method public int getCompoundPaddingStart();
		method public int getCompoundPaddingTop();
		method public final int getCurrentHintTextColor();
		method public final int getCurrentTextColor();
		@@ -27690,8 +27693,10 @@ package android.widget {
		method public float getTextScaleX();
		method public float getTextSize();
		method public int getTotalPaddingBottom();
		method public int getTotalPaddingEnd();
		method public int getTotalPaddingLeft();
		method public int getTotalPaddingRight();
		method public int getTotalPaddingStart();
		method public int getTotalPaddingTop();
		method public final android.text.method.TransformationMethod getTransformationMethod();
		method public android.graphics.Typeface getTypeface();
		@@ -27721,6 +27726,9 @@ package android.widget {
		method public final void setAutoLinkMask(int);
		method public void setCompoundDrawablePadding(int);
		method public void setCompoundDrawables(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
		method public void setCompoundDrawablesRelative(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
		method public void setCompoundDrawablesRelativeWithIntrinsicBounds(int, int, int, int);
		method public void setCompoundDrawablesRelativeWithIntrinsicBounds(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
		method public void setCompoundDrawablesWithIntrinsicBounds(int, int, int, int);
		method public void setCompoundDrawablesWithIntrinsicBounds(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
		method public void setCursorVisible(boolean);

core/java/android/widget/TextView.java

+2 −16

Original line number	Diff line number	Diff line
		@@ -216,6 +216,8 @@ import java.util.Locale;
		* @attr ref android.R.styleable#TextView_drawableBottom
		* @attr ref android.R.styleable#TextView_drawableRight
		* @attr ref android.R.styleable#TextView_drawableLeft
		* @attr ref android.R.styleable#TextView_drawableStart
		* @attr ref android.R.styleable#TextView_drawableEnd
		* @attr ref android.R.styleable#TextView_drawablePadding
		* @attr ref android.R.styleable#TextView_lineSpacingExtra
		* @attr ref android.R.styleable#TextView_lineSpacingMultiplier
		@@ -1520,8 +1522,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		/**
		* Returns the start padding of the view, plus space for the start
		* Drawable if any.
		*
		* @hide
		*/
		public int getCompoundPaddingStart() {
		resolveDrawables();
		@@ -1537,8 +1537,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		/**
		* Returns the end padding of the view, plus space for the end
		* Drawable if any.
		*
		* @hide
		*/
		public int getCompoundPaddingEnd() {
		resolveDrawables();
		@@ -1636,8 +1634,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		/**
		* Returns the total start padding of the view, including the start
		* Drawable if any.
		*
		* @hide
		*/
		public int getTotalPaddingStart() {
		return getCompoundPaddingStart();
		@@ -1646,8 +1642,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		/**
		* Returns the total end padding of the view, including the end
		* Drawable if any.
		*
		* @hide
		*/
		public int getTotalPaddingEnd() {
		return getCompoundPaddingEnd();
		@@ -1849,8 +1843,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* @attr ref android.R.styleable#TextView_drawableTop
		* @attr ref android.R.styleable#TextView_drawableEnd
		* @attr ref android.R.styleable#TextView_drawableBottom
		*
		* @hide
		*/
		public void setCompoundDrawablesRelative(Drawable start, Drawable top,
		Drawable end, Drawable bottom) {
		@@ -1972,8 +1964,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* @attr ref android.R.styleable#TextView_drawableTop
		* @attr ref android.R.styleable#TextView_drawableEnd
		* @attr ref android.R.styleable#TextView_drawableBottom
		*
		* @hide
		*/
		public void setCompoundDrawablesRelativeWithIntrinsicBounds(int start, int top, int end,
		int bottom) {
		@@ -1996,8 +1986,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* @attr ref android.R.styleable#TextView_drawableTop
		* @attr ref android.R.styleable#TextView_drawableEnd
		* @attr ref android.R.styleable#TextView_drawableBottom
		*
		* @hide
		*/
		public void setCompoundDrawablesRelativeWithIntrinsicBounds(Drawable start, Drawable top,
		Drawable end, Drawable bottom) {
		@@ -2034,8 +2022,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		/**
		* Returns drawables for the start, top, end, and bottom borders.
		*
		* @hide
		*/
		public Drawable[] getCompoundDrawablesRelative() {
		final Drawables dr = mDrawables;