Change vector setup check to use non-themed drawable
Since we will soon have a public API for getDrawable(),
we should make sure that our setup check works when the
theme doesn't contain AppCompat attributes.
Previously we were using the back icon, which references
AppCompat theme attrs.
BUG: 30361033
Change-Id: I8eb215293cdf6dc7832a503ffd1b0040c557e141
diff --git a/v7/appcompat/res/drawable/abc_vector_test.xml b/v7/appcompat/res/drawable/abc_vector_test.xml
new file mode 100644
index 0000000..d5da2cb
--- /dev/null
+++ b/v7/appcompat/res/drawable/abc_vector_test.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z"/>
+</vector>
\ No newline at end of file
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
index 3c161c7..3dc9a04 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
@@ -702,10 +702,9 @@
return;
}
// Here we will check that a known Vector drawable resource inside AppCompat can be
- // correctly decoded. We use one that will almost definitely be used in the future to
- // negate any wasted work
+ // correctly decoded
mHasCheckedVectorDrawableSetup = true;
- final Drawable d = getDrawable(context, R.drawable.abc_ic_ab_back_material);
+ final Drawable d = getDrawable(context, R.drawable.abc_vector_test);
if (d == null || !isVectorDrawable(d)) {
mHasCheckedVectorDrawableSetup = false;
throw new IllegalStateException("This app has been built with an incorrect "
