From 2d3ca47ef83c097e3a1aaa66f2d119be0e93e677 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 25 Feb 2016 12:27:02 -0500 Subject: [PATCH] Always update drawable container source res Bug: 27349209 Change-Id: I3bb3d4862a03fd5ce0beeb2bf5208f2917ec9320 --- .../graphics/drawable/DrawableContainer.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index d05c66a8437c4..3b0e7e8c704e3 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -898,19 +898,19 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { * @param res the resources used to inflate density-dependent values */ final void updateDensity(Resources res) { - if (mSourceRes != null) { + if (res != null) { mSourceRes = res; - } - // The density may have changed since the last update (if any). Any - // dimension-type attributes will need their default values scaled. - final int targetDensity = Drawable.resolveDensity(res, mDensity); - final int sourceDensity = mDensity; - mDensity = targetDensity; + // The density may have changed since the last update (if any). Any + // dimension-type attributes will need their default values scaled. + final int targetDensity = Drawable.resolveDensity(res, mDensity); + final int sourceDensity = mDensity; + mDensity = targetDensity; - if (sourceDensity != targetDensity) { - mCheckedConstantSize = false; - mCheckedPadding = false; + if (sourceDensity != targetDensity) { + mCheckedConstantSize = false; + mCheckedPadding = false; + } } }