diff options
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 84202eb398e5..22f5e23e5168 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -2551,7 +2551,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener r = c.getResources(); setRawTextSize(TypedValue.applyDimension( - unit, size, r.getDisplayMetrics())); + unit, size, r.getDisplayMetrics())); } private void setRawTextSize(float size) { @@ -3505,6 +3505,34 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } + /** @hide */ + @Override + protected void setDrawableHotspot(float x, float y) { + super.setDrawableHotspot(x, y); + + final Drawables dr = mDrawables; + if (dr != null) { + if (dr.mDrawableTop != null) { + dr.mDrawableTop.setHotspot(x, y); + } + if (dr.mDrawableBottom != null) { + dr.mDrawableBottom.setHotspot(x, y); + } + if (dr.mDrawableLeft != null) { + dr.mDrawableLeft.setHotspot(x, y); + } + if (dr.mDrawableRight != null) { + dr.mDrawableRight.setHotspot(x, y); + } + if (dr.mDrawableStart != null) { + dr.mDrawableStart.setHotspot(x, y); + } + if (dr.mDrawableEnd != null) { + dr.mDrawableEnd.setHotspot(x, y); + } + } + } + @Override public Parcelable onSaveInstanceState() { Parcelable superState = super.onSaveInstanceState(); |