diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-18 18:05:15 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-06-18 18:05:15 -0700 |
| commit | 8de1494557cf1d00c1c3fce439138a28de7fbd61 (patch) | |
| tree | 32da38b42bddb9e47060e1fefed6430e528ffee3 /core/java/android/widget/FrameLayout.java | |
| parent | e48df005750549b5531a916368f168189e370acc (diff) | |
| download | frameworks_base-8de1494557cf1d00c1c3fce439138a28de7fbd61.zip frameworks_base-8de1494557cf1d00c1c3fce439138a28de7fbd61.tar.gz frameworks_base-8de1494557cf1d00c1c3fce439138a28de7fbd61.tar.bz2 | |
Fix switch & slider anim, make View drawable hotspot API public
BUG: 15287810
Change-Id: Ic7a9549dc1ba8afd07e9a196371ed349a54aaf2f
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 5a14929..34f333e 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -26,7 +26,6 @@ import android.graphics.Canvas; import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.Region; -import android.graphics.PorterDuff.Mode; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.Gravity; @@ -223,10 +222,9 @@ public class FrameLayout extends ViewGroup { } } - /** @hide */ @Override - protected void setDrawableHotspot(float x, float y) { - super.setDrawableHotspot(x, y); + public void drawableHotspotChanged(float x, float y) { + super.drawableHotspotChanged(x, y); if (mForeground != null) { mForeground.setHotspot(x, y); |