diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-03-08 11:13:27 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-08 11:13:27 -0800 |
| commit | 0c245fb201aa28776586dc1ce4fc4fc281f894a7 (patch) | |
| tree | d3d951edc605615f0a383b7bfc9eed702682b763 /core/java | |
| parent | 731f018928ea122e5367eb23bc6c94cde0e53b2d (diff) | |
| parent | d159109bd88e290ffacce30aaff42b0a0c790709 (diff) | |
| download | frameworks_base-0c245fb201aa28776586dc1ce4fc4fc281f894a7.zip frameworks_base-0c245fb201aa28776586dc1ce4fc4fc281f894a7.tar.gz frameworks_base-0c245fb201aa28776586dc1ce4fc4fc281f894a7.tar.bz2 | |
Merge "Make more TextView RTL APIs public"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 4719010..47e10cc 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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; |