Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5103c60 authored by Sean Liu's avatar Sean Liu Committed by Android (Google) Code Review
Browse files

Merge "Using VectorDrawableCompat for svg to avoid crash on Lollipop"

parents 305dede0 8e56edfe

src/com/android/contacts/quickcontact/QuickContactActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import android.provider.ContactsContract.DataUsageFeedback; 
import android.provider.ContactsContract.Intents;

import android.provider.ContactsContract.QuickContact;

import android.provider.ContactsContract.RawContacts;

import android.support.graphics.drawable.VectorDrawableCompat;

import android.support.v4.app.ActivityCompat;

import android.support.v4.content.ContextCompat;

import android.support.v7.graphics.Palette;
@@ -2683,8 +2684,9 @@ public class QuickContactActivity extends ContactsActivity 
                Trace.endSection();

                Trace.beginSection("initialize permission explanation card");



                final Drawable historyIcon = getResources().getDrawable(

                        R.drawable.ic_history_24dp).mutate();

                final Drawable historyIcon = VectorDrawableCompat.create(

                        getResources(), R.drawable.ic_history_24dp, null);



                final Entry permissionExplanationEntry = new Entry(CARD_ENTRY_ID_REQUEST_PERMISSION,

                        historyIcon, getString(R.string.permission_explanation_header),

                        mPermissionExplanationCardSubHeader, /* subHeaderIcon = */ null,