From bd9836496cc4fb7ba5ae14c6a3091ec06ee40e35 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Fri, 24 Feb 2017 16:57:40 -0500 Subject: [PATCH] Provide some compatibility story for devs in the past They should be providing themes when resolving certain resources, but they aren't anyway, so try to provide it free of charge, when possible. Also, nothing is ever free. Test: Open app that uses old/bad resource methods Change-Id: Icd57aadf1202ddffb1dd73ab45119fae7e5d6130 Fixes: 35656110 --- core/java/android/app/ContextImpl.java | 40 +++++++----- .../android/content/res/CompatResources.java | 63 +++++++++++++++++++ 2 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 core/java/android/content/res/CompatResources.java diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 3e9b9877ee492..7ee93d0ee7907 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -38,6 +38,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.AssetManager; +import android.content.res.CompatResources; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.content.res.Resources; @@ -49,6 +50,7 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Binder; import android.os.Build; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Debug; import android.os.Environment; @@ -1925,8 +1927,8 @@ class ContextImpl extends Context { final int displayId = mDisplay != null ? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY; - c.mResources = createResources(mActivityToken, pi, displayId, null, - getDisplayAdjustments(displayId).getCompatibilityInfo()); + c.setResources(createResources(mActivityToken, pi, displayId, null, + getDisplayAdjustments(displayId).getCompatibilityInfo())); if (c.mResources != null) { return c; } @@ -1962,8 +1964,8 @@ class ContextImpl extends Context { final int displayId = mDisplay != null ? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY; - c.mResources = createResources(mActivityToken, pi, displayId, null, - getDisplayAdjustments(displayId).getCompatibilityInfo()); + c.setResources(createResources(mActivityToken, pi, displayId, null, + getDisplayAdjustments(displayId).getCompatibilityInfo())); if (c.mResources != null) { return c; } @@ -1990,7 +1992,7 @@ class ContextImpl extends Context { final int displayId = mDisplay != null ? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY; - context.mResources = ResourcesManager.getInstance().getResources( + context.setResources(ResourcesManager.getInstance().getResources( mActivityToken, mPackageInfo.getResDir(), paths, @@ -1999,7 +2001,7 @@ class ContextImpl extends Context { displayId, null, mPackageInfo.getCompatibilityInfo(), - classLoader); + classLoader)); return context; } @@ -2013,8 +2015,8 @@ class ContextImpl extends Context { mUser, mFlags, mClassLoader); final int displayId = mDisplay != null ? mDisplay.getDisplayId() : Display.DEFAULT_DISPLAY; - context.mResources = createResources(mActivityToken, mPackageInfo, displayId, - overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo()); + context.setResources(createResources(mActivityToken, mPackageInfo, displayId, + overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo())); return context; } @@ -2028,8 +2030,8 @@ class ContextImpl extends Context { mUser, mFlags, mClassLoader); final int displayId = display.getDisplayId(); - context.mResources = createResources(mActivityToken, mPackageInfo, displayId, null, - getDisplayAdjustments(displayId).getCompatibilityInfo()); + context.setResources(createResources(mActivityToken, mPackageInfo, displayId, null, + getDisplayAdjustments(displayId).getCompatibilityInfo())); context.mDisplay = display; return context; } @@ -2136,7 +2138,7 @@ class ContextImpl extends Context { LoadedApk packageInfo = new LoadedApk(mainThread); ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, 0, null); - context.mResources = packageInfo.getResources(); + context.setResources(packageInfo.getResources()); context.mResources.updateConfiguration(context.mResourcesManager.getConfiguration(), context.mResourcesManager.getDisplayMetrics()); return context; @@ -2146,7 +2148,7 @@ class ContextImpl extends Context { if (packageInfo == null) throw new IllegalArgumentException("packageInfo"); ContextImpl context = new ContextImpl(null, mainThread, packageInfo, null, null, 0, null); - context.mResources = packageInfo.getResources(); + context.setResources(packageInfo.getResources()); return context; } @@ -2185,7 +2187,7 @@ class ContextImpl extends Context { // Create the base resources for which all configuration contexts for this Activity // will be rebased upon. - context.mResources = resourcesManager.createBaseActivityResources(activityToken, + context.setResources(resourcesManager.createBaseActivityResources(activityToken, packageInfo.getResDir(), splitDirs, packageInfo.getOverlayDirs(), @@ -2193,7 +2195,7 @@ class ContextImpl extends Context { displayId, overrideConfiguration, compatInfo, - classLoader); + classLoader)); context.mDisplay = resourcesManager.getAdjustedDisplay(displayId, context.getResources()); return context; @@ -2232,7 +2234,7 @@ class ContextImpl extends Context { if (container != null) { mBasePackageName = container.mBasePackageName; mOpPackageName = container.mOpPackageName; - mResources = container.mResources; + setResources(container.mResources); mDisplay = container.mDisplay; } else { mBasePackageName = packageInfo.mPackageName; @@ -2251,6 +2253,14 @@ class ContextImpl extends Context { mContentResolver = new ApplicationContentResolver(this, mainThread, user); } + void setResources(Resources r) { + if (mPackageInfo.getTargetSdkVersion() < VERSION_CODES.O) { + mResources = new CompatResources(r, this); + } else { + mResources = r; + } + } + void installSystemApplicationInfo(ApplicationInfo info, ClassLoader classLoader) { mPackageInfo.installSystemApplicationInfo(info, classLoader); } diff --git a/core/java/android/content/res/CompatResources.java b/core/java/android/content/res/CompatResources.java new file mode 100644 index 0000000000000..15575fd10e83a --- /dev/null +++ b/core/java/android/content/res/CompatResources.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2017 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.content.res; + +import android.annotation.ColorRes; +import android.annotation.DrawableRes; +import android.content.Context; +import android.graphics.drawable.Drawable; + +import java.lang.ref.WeakReference; + +/** + * Version of resources generated for apps targeting <26. + * @hide + */ +public class CompatResources extends Resources { + + private final WeakReference mContext; + + public CompatResources(Resources base, Context context) { + super(base.getClassLoader()); + setImpl(base.getImpl()); + mContext = new WeakReference<>(context); + } + + @Override + public Drawable getDrawable(@DrawableRes int id) throws NotFoundException { + return getDrawable(id, getTheme()); + } + + @Override + public Drawable getDrawableForDensity(@DrawableRes int id, int density) + throws NotFoundException { + return getDrawableForDensity(id, density, getTheme()); + } + + @Override + public int getColor(@ColorRes int id) throws NotFoundException { + return getColor(id, getTheme()); + } + + @Override + public ColorStateList getColorStateList(@ColorRes int id) throws NotFoundException { + return getColorStateList(id, getTheme()); + } + + private Theme getTheme() { + Context c = mContext.get(); + return c != null ? c.getTheme() : null; + } +}