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

Merge "Add guard around getXmlFileParser() call" into mnc-ub-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2016-03-21 18:53:55 +00:00
committed by Android (Google) Code Review
parent f2af68312b 13d2e2e10b
commit 86621737fc
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java
View File

@@ -26,6 +26,7 @@ import com.android.internal.util.XmlUtils;
import com.android.layoutlib.bridge.Bridge; import com.android.layoutlib.bridge.Bridge;
import com.android.layoutlib.bridge.android.BridgeContext; import com.android.layoutlib.bridge.android.BridgeContext;
import com.android.layoutlib.bridge.android.BridgeXmlBlockParser; import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;
import com.android.layoutlib.bridge.android.RenderParamsFlags;
import com.android.layoutlib.bridge.impl.ParserFactory; import com.android.layoutlib.bridge.impl.ParserFactory;
import com.android.layoutlib.bridge.impl.ResourceHelper; import com.android.layoutlib.bridge.impl.ResourceHelper;
import com.android.resources.ResourceType; import com.android.resources.ResourceType;
@@ -329,8 +330,13 @@ public final class BridgeTypedArray extends TypedArray {
try { try {
// Get the state list file content from callback to parse PSI file XmlPullParser parser = null;
XmlPullParser parser = mContext.getLayoutlibCallback().getXmlFileParser(value); Boolean psiParserSupport = mContext.getLayoutlibCallback().getFlag(
RenderParamsFlags.FLAG_KEY_XML_FILE_PARSER_SUPPORT);
if (psiParserSupport != null && psiParserSupport) {
// Get the state list file content from callback to parse PSI file
parser = mContext.getLayoutlibCallback().getXmlFileParser(value);
}
if (parser == null) { if (parser == null) {
// If used with a version of Android Studio that does not implement getXmlFileParser // If used with a version of Android Studio that does not implement getXmlFileParser
// fall back to reading the file from disk // fall back to reading the file from disk

10
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/RenderParamsFlags.java
View File

@@ -16,6 +16,7 @@
package com.android.layoutlib.bridge.android; package com.android.layoutlib.bridge.android;
import com.android.ide.common.rendering.api.LayoutlibCallback;
import com.android.ide.common.rendering.api.RenderParams; import com.android.ide.common.rendering.api.RenderParams;
import com.android.ide.common.rendering.api.SessionParams.Key; import com.android.ide.common.rendering.api.SessionParams.Key;
@@ -42,11 +43,16 @@ public final class RenderParamsFlags {
public static final Key<Boolean> FLAG_KEY_RECYCLER_VIEW_SUPPORT = public static final Key<Boolean> FLAG_KEY_RECYCLER_VIEW_SUPPORT =
new Key<Boolean>("recyclerViewSupport", Boolean.class); new Key<Boolean>("recyclerViewSupport", Boolean.class);
/** /**
* The application package name. Used via * The application package name. Used via {@link LayoutlibCallback#getFlag(Key)}
* {@link com.android.ide.common.rendering.api.LayoutlibCallback#getFlag(Key)}
*/ */
public static final Key<String> FLAG_KEY_APPLICATION_PACKAGE = public static final Key<String> FLAG_KEY_APPLICATION_PACKAGE =
new Key<String>("applicationPackage", String.class); new Key<String>("applicationPackage", String.class);
/**
* To tell LayoutLib that IDE supports providing XML Parser for a file (useful for getting in
* memory contents of the file). Used via {@link LayoutlibCallback#getFlag(Key)}
*/
public static final Key<Boolean> FLAG_KEY_XML_FILE_PARSER_SUPPORT =
new Key<Boolean>("xmlFileParser", Boolean.class);
// Disallow instances. // Disallow instances.
private RenderParamsFlags() {} private RenderParamsFlags() {}