summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2015-05-15 00:01:51 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-05-15 00:01:52 +0000
commit2cdf5eaad4ad84fc87b73945fdd3262da4a0ab43 (patch)
tree7f7f51f7897780ca7b8be0df5cb4ac7bd5363cd2
parent0e4a2b5ff0ee061c46bfe3b1f15a7067308e0da8 (diff)
parent3dc19883c571a829c36aa603c04a55c91b00dd57 (diff)
Merge "Fix build: udpate parser factory method" into mnc-dev
-rw-r--r--tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
index b1a1f4d318e6..ab682fdc40da 100644
--- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
+++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/setup/LayoutLibTestCallback.java
@@ -23,6 +23,7 @@ import com.android.ide.common.rendering.api.ActionBarCallback;
import com.android.ide.common.rendering.api.AdapterBinding;
import com.android.ide.common.rendering.api.ILayoutPullParser;
import com.android.ide.common.rendering.api.LayoutlibCallback;
+import com.android.ide.common.rendering.api.ParserFactory;
import com.android.ide.common.rendering.api.ResourceReference;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.resources.IntArrayWrapper;
@@ -32,6 +33,7 @@ import com.android.utils.ILogger;
import org.kxml2.io.KXmlParser;
import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
import java.io.File;
import java.lang.reflect.Constructor;
@@ -163,7 +165,14 @@ public class LayoutLibTestCallback extends LayoutlibCallback {
@NonNull
@Override
- public XmlPullParser createParser(@Nullable String name) {
- return new KXmlParser();
+ public ParserFactory getParserFactory() {
+ return new ParserFactory() {
+ @NonNull
+ @Override
+ public XmlPullParser createParser(@Nullable String debugName)
+ throws XmlPullParserException {
+ return new KXmlParser();
+ }
+ };
}
}