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

Merge "Fix that CSL cache hits produce bad drawables" into sc-dev

Browse Source
This commit is contained in:
John Reck
2021-04-27 19:59:13 +00:00
committed by Android (Google) Code Review
parent e1d6b0872f b541034702
commit 3aa5a8fb72
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,12 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac
setColorStateList(colorStateList);
}
private ColorStateListDrawable(@NonNull ColorStateListDrawableState state) {
mState = state;
initializeColorDrawable();
onStateChange(getState());
}
@Override
public void draw(@NonNull Canvas canvas) {
mColorDrawable.draw(canvas);
@@ -286,11 +292,6 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac
}
}
private ColorStateListDrawable(@NonNull ColorStateListDrawableState state) {
mState = state;
initializeColorDrawable();
}
private void initializeColorDrawable() {
mColorDrawable = new ColorDrawable();
mColorDrawable.setCallback(this);