From eca29cf944025ace772101a160c06011f479a236 Mon Sep 17 00:00:00 2001
From: Winson <chiuwinson@google.com>
Date: Wed, 19 Jun 2019 16:26:50 -0700
Subject: Fix ColorStateListDrawable bounds handling

The inner Drawable was never updated.

Bug: 135592087

Test: atest ColorStateListDrawableTest
Test: manual test valid ColorStateList XML in res/color

Change-Id: If922acd3054ded7cc068241376ebf7017e1ff6ff
---
 .../java/android/graphics/drawable/ColorStateListDrawable.java     | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'graphics/java/android')

diff --git a/graphics/java/android/graphics/drawable/ColorStateListDrawable.java b/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
index 35021a66f572..20cd825fe306 100644
--- a/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
+++ b/graphics/java/android/graphics/drawable/ColorStateListDrawable.java
@@ -25,6 +25,7 @@ import android.graphics.BlendMode;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
+import android.graphics.Rect;
 import android.util.MathUtils;
 
 /**
@@ -135,6 +136,12 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac
         return mColorDrawable.getOpacity();
     }
 
+    @Override
+    protected void onBoundsChange(Rect bounds) {
+        super.onBoundsChange(bounds);
+        mColorDrawable.setBounds(bounds);
+    }
+
     @Override
     protected boolean onStateChange(int[] state) {
         if (mState.mColor != null) {
-- 
cgit v1.2.3-59-g8ed1b