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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-20 17:32:31 +00:00
committed by Android (Google) Code Review
parent 6e4e9817b8 eca29cf944
commit fcbde5243a
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) {