summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-06-18 18:05:15 -0700
committerAlan Viverette <alanv@google.com>2014-06-18 18:05:15 -0700
commit8de1494557cf1d00c1c3fce439138a28de7fbd61 (patch)
tree32da38b42bddb9e47060e1fefed6430e528ffee3 /core/java/android/widget/ImageView.java
parente48df005750549b5531a916368f168189e370acc (diff)
downloadframeworks_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/ImageView.java')
-rw-r--r--core/java/android/widget/ImageView.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 399e087..5d578ca 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -32,7 +32,6 @@ import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Xfermode;
-import android.graphics.PorterDuff.Mode;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -1109,10 +1108,9 @@ public class ImageView extends View {
}
}
- /** @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 (mDrawable != null) {
mDrawable.setHotspot(x, y);