merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/v7/appcompat/src/android/support/v7/internal/widget/ResourcesWrapper.java b/v7/appcompat/src/android/support/v7/internal/widget/ResourcesWrapper.java
new file mode 100644
index 0000000..48ebab8
--- /dev/null
+++ b/v7/appcompat/src/android/support/v7/internal/widget/ResourcesWrapper.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2015 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.
+ */
+
+package android.support.v7.internal.widget;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.content.res.AssetFileDescriptor;
+import android.content.res.AssetManager;
+import android.content.res.ColorStateList;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.graphics.Movie;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.LongSparseArray;
+import android.util.TypedValue;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * This extends Resources but delegates the calls to another Resources object. This enables
+ * any customization done by some subclass of Resources to be also picked up.
+ */
+class ResourcesWrapper extends Resources {
+
+ private final Resources mResources;
+
+ public ResourcesWrapper(Resources resources) {
+ super(resources.getAssets(), resources.getDisplayMetrics(), resources.getConfiguration());
+ mResources = resources;
+ }
+
+ @Override
+ public CharSequence getText(int id) throws NotFoundException {
+ return mResources.getText(id);
+ }
+
+ @Override
+ public CharSequence getQuantityText(int id, int quantity) throws NotFoundException {
+ return mResources.getQuantityText(id, quantity);
+ }
+
+ @Override
+ public String getString(int id) throws NotFoundException {
+ return mResources.getString(id);
+ }
+
+ @Override
+ public String getString(int id, Object... formatArgs) throws NotFoundException {
+ return mResources.getString(id, formatArgs);
+ }
+
+ @Override
+ public String getQuantityString(int id, int quantity, Object... formatArgs)
+ throws NotFoundException {
+ return mResources.getQuantityString(id, quantity, formatArgs);
+ }
+
+ @Override
+ public String getQuantityString(int id, int quantity) throws NotFoundException {
+ return mResources.getQuantityString(id, quantity);
+ }
+
+ @Override
+ public CharSequence getText(int id, CharSequence def) {
+ return mResources.getText(id, def);
+ }
+
+ @Override
+ public CharSequence[] getTextArray(int id) throws NotFoundException {
+ return mResources.getTextArray(id);
+ }
+
+ @Override
+ public String[] getStringArray(int id) throws NotFoundException {
+ return mResources.getStringArray(id);
+ }
+
+ @Override
+ public int[] getIntArray(int id) throws NotFoundException {
+ return mResources.getIntArray(id);
+ }
+
+ @Override
+ public TypedArray obtainTypedArray(int id) throws NotFoundException {
+ return mResources.obtainTypedArray(id);
+ }
+
+ @Override
+ public float getDimension(int id) throws NotFoundException {
+ return mResources.getDimension(id);
+ }
+
+ @Override
+ public int getDimensionPixelOffset(int id) throws NotFoundException {
+ return mResources.getDimensionPixelOffset(id);
+ }
+
+ @Override
+ public int getDimensionPixelSize(int id) throws NotFoundException {
+ return mResources.getDimensionPixelSize(id);
+ }
+
+ @Override
+ public float getFraction(int id, int base, int pbase) {
+ return mResources.getFraction(id, base, pbase);
+ }
+
+ @Override
+ public Drawable getDrawable(int id) throws NotFoundException {
+ return mResources.getDrawable(id);
+ }
+
+ @Override
+ public Drawable getDrawable(int id, Theme theme) throws NotFoundException {
+ return mResources.getDrawable(id, theme);
+ }
+
+ @Override
+ public Drawable getDrawableForDensity(int id, int density) throws NotFoundException {
+ return mResources.getDrawableForDensity(id, density);
+ }
+
+ @Override
+ public Drawable getDrawableForDensity(int id, int density, Theme theme) {
+ return mResources.getDrawableForDensity(id, density, theme);
+ }
+
+ @Override
+ public Movie getMovie(int id) throws NotFoundException {
+ return mResources.getMovie(id);
+ }
+
+ @Override
+ public int getColor(int id) throws NotFoundException {
+ return mResources.getColor(id);
+ }
+
+ @Override
+ public ColorStateList getColorStateList(int id) throws NotFoundException {
+ return mResources.getColorStateList(id);
+ }
+
+ @Override
+ public boolean getBoolean(int id) throws NotFoundException {
+ return mResources.getBoolean(id);
+ }
+
+ @Override
+ public int getInteger(int id) throws NotFoundException {
+ return mResources.getInteger(id);
+ }
+
+ @Override
+ public XmlResourceParser getLayout(int id) throws NotFoundException {
+ return mResources.getLayout(id);
+ }
+
+ @Override
+ public XmlResourceParser getAnimation(int id) throws NotFoundException {
+ return mResources.getAnimation(id);
+ }
+
+ @Override
+ public XmlResourceParser getXml(int id) throws NotFoundException {
+ return mResources.getXml(id);
+ }
+
+ @Override
+ public InputStream openRawResource(int id) throws NotFoundException {
+ return mResources.openRawResource(id);
+ }
+
+ @Override
+ public InputStream openRawResource(int id, TypedValue value) throws NotFoundException {
+ return mResources.openRawResource(id, value);
+ }
+
+ @Override
+ public AssetFileDescriptor openRawResourceFd(int id) throws NotFoundException {
+ return mResources.openRawResourceFd(id);
+ }
+
+ @Override
+ public void getValue(int id, TypedValue outValue, boolean resolveRefs)
+ throws NotFoundException {
+ mResources.getValue(id, outValue, resolveRefs);
+ }
+
+ @Override
+ public void getValueForDensity(int id, int density, TypedValue outValue, boolean resolveRefs)
+ throws NotFoundException {
+ mResources.getValueForDensity(id, density, outValue, resolveRefs);
+ }
+
+ @Override
+ public void getValue(String name, TypedValue outValue, boolean resolveRefs)
+ throws NotFoundException {
+ mResources.getValue(name, outValue, resolveRefs);
+ }
+
+ @Override
+ public TypedArray obtainAttributes(AttributeSet set, int[] attrs) {
+ return mResources.obtainAttributes(set, attrs);
+ }
+
+ @Override
+ public void updateConfiguration(Configuration config, DisplayMetrics metrics) {
+ super.updateConfiguration(config, metrics);
+ if (mResources != null) { // called from super's constructor. So, need to check.
+ mResources.updateConfiguration(config, metrics);
+ }
+ }
+
+ @Override
+ public DisplayMetrics getDisplayMetrics() {
+ return mResources.getDisplayMetrics();
+ }
+
+ @Override
+ public Configuration getConfiguration() {
+ return mResources.getConfiguration();
+ }
+
+ @Override
+ public int getIdentifier(String name, String defType, String defPackage) {
+ return mResources.getIdentifier(name, defType, defPackage);
+ }
+
+ @Override
+ public String getResourceName(int resid) throws NotFoundException {
+ return mResources.getResourceName(resid);
+ }
+
+ @Override
+ public String getResourcePackageName(int resid) throws NotFoundException {
+ return mResources.getResourcePackageName(resid);
+ }
+
+ @Override
+ public String getResourceTypeName(int resid) throws NotFoundException {
+ return mResources.getResourceTypeName(resid);
+ }
+
+ @Override
+ public String getResourceEntryName(int resid) throws NotFoundException {
+ return mResources.getResourceEntryName(resid);
+ }
+
+ @Override
+ public void parseBundleExtras(XmlResourceParser parser, Bundle outBundle)
+ throws XmlPullParserException, IOException {
+ mResources.parseBundleExtras(parser, outBundle);
+ }
+
+ @Override
+ public void parseBundleExtra(String tagName, AttributeSet attrs, Bundle outBundle)
+ throws XmlPullParserException {
+ mResources.parseBundleExtra(tagName, attrs, outBundle);
+ }
+}
+
diff --git a/v7/appcompat/src/android/support/v7/internal/widget/TintResources.java b/v7/appcompat/src/android/support/v7/internal/widget/TintResources.java
index eb36855..3dfbbc1 100644
--- a/v7/appcompat/src/android/support/v7/internal/widget/TintResources.java
+++ b/v7/appcompat/src/android/support/v7/internal/widget/TintResources.java
@@ -25,12 +25,12 @@
*
* @hide
*/
-class TintResources extends Resources {
+class TintResources extends ResourcesWrapper {
private final TintManager mTintManager;
public TintResources(Resources resources, TintManager tintManager) {
- super(resources.getAssets(), resources.getDisplayMetrics(), resources.getConfiguration());
+ super(resources);
mTintManager = tintManager;
}
