diff options
| author | Alan Viverette <alanv@google.com> | 2015-10-20 17:24:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 17:24:45 +0000 |
| commit | e3d745291e1b4de16bddb545424b430cc48328c7 (patch) | |
| tree | 2e9e2ce03b9feb2d7ad2ad1924735e5c71cd65fe | |
| parent | ee15f087db590ea21f5ce44e4571bbcc2885aaf2 (diff) | |
| parent | 840f38905c073044077cb2bef68d20971f5d3d39 (diff) | |
| download | frameworks_base-e3d745291e1b4de16bddb545424b430cc48328c7.zip frameworks_base-e3d745291e1b4de16bddb545424b430cc48328c7.tar.gz frameworks_base-e3d745291e1b4de16bddb545424b430cc48328c7.tar.bz2 | |
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev
am: 840f38905c
* commit '840f38905c073044077cb2bef68d20971f5d3d39':
Update drawable matrix when bounds change in invalidateDrawable()
| -rw-r--r-- | core/java/android/widget/ImageView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index ddbaa9d..cc6ab65 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -234,6 +234,8 @@ public class ImageView extends View { if (w != mDrawableWidth || h != mDrawableHeight) { mDrawableWidth = w; mDrawableHeight = h; + // updates the matrix, which is dependent on the bounds + configureBounds(); } } /* we invalidate the whole view in this case because it's very |