commit 97ec382441af727583ed33e027f28c479f16fbd3
author Wenyi Wang <wenyiw@google.com> Sat Jul 16 19:26:03 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 16 19:26:03 2016 +0000
tree 1bb4ad95e08adb62541ab13b3b7c2969b67938a2
parent f5103c608aa826ab901e582f4081398523571dc7
parent db66269662b9b106ed76f70270b6ce7774d230db

Merge "Bring action bar up to spec (E3)"

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

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 5ec7818..07720f2 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -69,6 +69,7 @@
 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 @@
                 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,