Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 1a971773e6

Change-Id: Id6e72d627981004327d7a91d0e2b146300235173
This commit is contained in:
Winson
2019-06-20 11:08:17 -07:00
committed by android-build-merger
parent 1411c5e6b8 1a971773e6
commit afc037a39b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/java/android/graphics/drawable/ColorStateListDrawable.java
View File

@@ -25,6 +25,7 @@ import android.graphics.BlendMode;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.ColorFilter; import android.graphics.ColorFilter;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.util.MathUtils; import android.util.MathUtils;
/** /**
@@ -135,6 +136,12 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac
return mColorDrawable.getOpacity(); return mColorDrawable.getOpacity();
} }
@Override
protected void onBoundsChange(Rect bounds) {
super.onBoundsChange(bounds);
mColorDrawable.setBounds(bounds);
}
@Override @Override
protected boolean onStateChange(int[] state) { protected boolean onStateChange(int[] state) {
if (mState.mColor != null) { if (mState.mColor != null) {