From a72f59a858ebda3d96583502d8ac02443d6223c3 Mon Sep 17 00:00:00 2001 From: Snild Dolkow Date: Fri, 4 Sep 2015 10:08:05 +0200 Subject: Update mFillPaint color on GradientDrawable inflation When a GradientDrawable is loaded from scratch, initializeWithState() is called with mColors == null. This sets mFillPaint's color to 0x00000000 -- transparent. mColors is then properly set in inflate(), but mFillPaint is not updated there. It will be updated eventually through a mutate() or ensureValidRect() call, but that's sometimes too late. In our case, a wrapping StateListDrawable called getOpacity(), and since it caches the result, it never got updated. This doesn't cause any problems on preloaded GradientDrawables, since the new GradientDrawable created when fetching a preload will call initializeWithState() in its constructor, fixing the GradientState. Change-Id: Ic8caa7c6a7c1d4dae5ff31ae943831bd2e014f79 --- graphics/java/android/graphics/drawable/GradientDrawable.java | 1 + 1 file changed, 1 insertion(+) diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 72707e699a14..e097b57989e1 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1019,6 +1019,7 @@ public class GradientDrawable extends Drawable { inflateChildElements(r, parser, attrs, theme); mGradientState.computeOpacity(); + initializeWithState(mGradientState); } @Override -- cgit v1.2.3-59-g8ed1b