commit 1a971773e6e8e5c4da686dd1198129d4f225f183
author Winson <chiuwinson@google.com> Thu Jun 20 11:03:28 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 11:03:28 2019 -0700
tree 589036d892c1b358ac5ca2be03273827f0944fcb
parent de05111e3ed3f50746245721578f04b9f8c71ea6
parent fcbde5243a9a4d188b834d9cd89d737a164fbe16

Merge "Fix ColorStateListDrawable bounds handling" into qt-dev
am: fcbde5243a

Change-Id: I3a619b554a7c59d29429efe1247c4a350874397d

graphics/java/android/graphics/drawable/ColorStateListDrawable.java

diff --git a/graphics/java/android/graphics/drawable/ColorStateListDrawable.java b/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
index 35021a6..20cd825 100644
--- a/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
@@ -25,6 +25,7 @@
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
+import android.graphics.Rect;
 import android.util.MathUtils;
 
 /**
@@ -136,6 +137,12 @@
     }
 
     @Override
+    protected void onBoundsChange(Rect bounds) {
+        super.onBoundsChange(bounds);
+        mColorDrawable.setBounds(bounds);
+    }
+
+    @Override
     protected boolean onStateChange(int[] state) {
         if (mState.mColor != null) {
             int color = mState.mColor.getColorForState(state, mState.mColor.getDefaultColor());