Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Initialize layoutlib variables before using them" into mnc-ub-dev

Browse Source
This commit is contained in:
Diego Perez
2016-03-10 16:06:39 +00:00
committed by Android (Google) Code Review
parent af0f3bda17 2591346546
commit f2af68312b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/layoutlib/bridge/src/android/content/res/Resources_Delegate.java
View File

@@ -89,6 +89,12 @@ public class Resources_Delegate {
// first get the String related to this id in the framework // first get the String related to this id in the framework
Pair<ResourceType, String> resourceInfo = Bridge.resolveResourceId(id); Pair<ResourceType, String> resourceInfo = Bridge.resolveResourceId(id);
// Set the layoutlib callback and context for resources
if (resources != Resources.mSystem && resources.mLayoutlibCallback == null) {
resources.mLayoutlibCallback = Resources.mSystem.mLayoutlibCallback;
resources.mContext = Resources.mSystem.mContext;
}
if (resourceInfo != null) { if (resourceInfo != null) {
platformResFlag_out[0] = true; platformResFlag_out[0] = true;
String attributeName = resourceInfo.getSecond(); String attributeName = resourceInfo.getSecond();
@@ -98,12 +104,6 @@ public class Resources_Delegate {
resourceInfo.getFirst(), attributeName)); resourceInfo.getFirst(), attributeName));
} }
// Set the layoutlib callback and context for resources
if (resources != Resources.mSystem && resources.mLayoutlibCallback == null) {
resources.mLayoutlibCallback = Resources.mSystem.mLayoutlibCallback;
resources.mContext = Resources.mSystem.mContext;
}
// didn't find a match in the framework? look in the project. // didn't find a match in the framework? look in the project.
if (resources.mLayoutlibCallback != null) { if (resources.mLayoutlibCallback != null) {
resourceInfo = resources.mLayoutlibCallback.resolveResourceId(id); resourceInfo = resources.mLayoutlibCallback.resolveResourceId(id);