commit be27390af8a3c47d91a9200ae4975b0fc43cc1b8
author Phil Weaver <pweaver@google.com> Wed Mar 14 16:03:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 14 16:03:28 2018 +0000
tree c37b675416b9686cd85596ee52289263a6f1dd99
parent de08983dd294443ac25255b1bf5f2e03f02819a0
parent 5a3e02dd38f07c8e7e3c7136ed0b4f17b87f7fd9

Merge "Don't pre-scale vector drawables in settings" into pi-dev

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 2a55829..1091aea 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -48,6 +48,7 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
 import android.hardware.fingerprint.FingerprintManager;
 import android.net.ConnectivityManager;
 import android.net.LinkProperties;
@@ -929,7 +930,7 @@
      */
     public static void setSafeIcon(Preference pref, Drawable icon) {
         Drawable safeIcon = icon;
-        if (icon != null) {
+        if ((icon != null) && !(icon instanceof VectorDrawable)) {
             safeIcon = getSafeDrawable(icon, 500, 500);
         }
         pref.setIcon(safeIcon);