summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-10-20 16:54:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-20 16:54:12 +0000
commit840f38905c073044077cb2bef68d20971f5d3d39 (patch)
tree04cf27d30698327881af113e43044296e5f0f236 /core
parent1313020acc93e601c98779d8859f44391c504ba2 (diff)
parent01320de8446f9414e38f4c17cb8eb9e4d0212afa (diff)
downloadframeworks_base-840f38905c073044077cb2bef68d20971f5d3d39.zip
frameworks_base-840f38905c073044077cb2bef68d20971f5d3d39.tar.gz
frameworks_base-840f38905c073044077cb2bef68d20971f5d3d39.tar.bz2
Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev
Diffstat (limited to 'core')
-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 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