PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Phil Weaver
2018-03-14 16:03:28 +00:00
committed by Android (Google) Code Review
parent de08983dd2 5a3e02dd38
commit be27390af8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/Utils.java
View File

@@ -48,6 +48,7 @@ import android.graphics.Bitmap;
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 final class Utils extends com.android.settingslib.Utils {
*/
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);