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

Merge "Always update drawable container source res" into nyc-dev

Browse Source
This commit is contained in:
Alan Viverette
2016-02-25 19:38:24 +00:00
committed by Android (Google) Code Review
parent e90c2c5ae9 2d3ca47ef8
commit fa5fa8f8a0
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -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;
}
}
}