commit 4ae5471c729c5706e79cb5a5e3bbcb194f550524
author Alan Viverette <alanv@google.com> Thu Oct 22 15:02:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 22 15:02:01 2015 +0000
tree 577b3462194600e31d3939af60c3a7cc25865dcb
parent 874ce44a80f913e104bcaf02b845577630b9d400
parent 4a94faa0c74c7ad4defdc6e2fa937c93a4d0b5af

Merge "Scale density correctly on VectorDrawable.applyTheme()"

graphics/java/android/graphics/drawable/VectorDrawable.java

diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index f1eaa23..e161f3d 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -603,7 +603,7 @@
         final int densityDpi = a.getResources().getDisplayMetrics().densityDpi;
         final int newSourceDensity = densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
         final int oldSourceDensity = pathRenderer.mSourceDensity;
-        final float densityScale = oldSourceDensity / (float) newSourceDensity;
+        final float densityScale = newSourceDensity / (float) oldSourceDensity;
         pathRenderer.mSourceDensity = newSourceDensity;
 
         final int tintMode = a.getInt(R.styleable.VectorDrawable_tintMode, -1);