summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ImageView.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-10-20 23:04:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-20 23:04:11 +0000
commit4fa91b18b62a285489c0ff717c1d9fb339364cae (patch)
tree88c2c7beb1fb6bbe27bc98b4eb3f9b66e04e573d /core/java/android/widget/ImageView.java
parent933dec6a2b210fad8496674391db8240a417a940 (diff)
parent27c5cbe5a87e618f7f8eafce90559525f4c2d70b (diff)
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev am: 840f38905c am: e3d745291e am: c3e46adc77
am: 27c5cbe5a8 * commit '27c5cbe5a87e618f7f8eafce90559525f4c2d70b': Update drawable matrix when bounds change in invalidateDrawable()
Diffstat (limited to 'core/java/android/widget/ImageView.java')
-rw-r--r--core/java/android/widget/ImageView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 245c7332aba3..6e90baf26fa2 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -232,6 +232,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