commit a856e96eb543c0d2de63921b148015fc32c9d6ba
author Alan Viverette <alanv@google.com> Fri Mar 18 12:36:00 2016 -0400
committer Alan Viverette <alanv@google.com> Fri Mar 18 12:36:00 2016 -0400
tree 264e4d985253f6e3e6264561de24eda7ecca2f31
parent 3b2e22a004f659c2e18faa7f2a6e0aa73ce695f2

Ensure nine-patch uses the best available target density

Bug: 27507887
Change-Id: Iddab4fdd2fe8fbf201dbb8ed42657a00509f42cc

graphics/java/android/graphics/drawable/NinePatchDrawable.java

diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
index fd3b9b4..5b1cc80 100644
--- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java
+++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java
@@ -748,7 +748,14 @@
             setDither(state.mDither);
         }
 
-        mTargetDensity = Drawable.resolveDensity(res, mTargetDensity);
+        // The nine-patch may have been created without a Resources object, in
+        // which case we should try to match the density of the nine patch (if
+        // available).
+        if (res == null && state.mNinePatch != null) {
+            mTargetDensity = state.mNinePatch.getDensity();
+        } else {
+            mTargetDensity = Drawable.resolveDensity(res, mTargetDensity);
+        }
         mTintFilter = updateTintFilter(mTintFilter, state.mTint, state.mTintMode);
         computeBitmapSize();
     }