aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-04-02 21:08:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-04-02 21:08:31 +0000
commite6aac48c7da09c20abcafba8ab003848aa8448bc (patch)
treee371eaaf17dbdae8d37775d49380a41bad79de15
parent34642d1d63c784ae9fd3fe123143d0b3f0773932 (diff)
parentbd79a42f7f0759858321a930c9faed6140ae85f2 (diff)
downloadsdk-e6aac48c7da09c20abcafba8ab003848aa8448bc.zip
sdk-e6aac48c7da09c20abcafba8ab003848aa8448bc.tar.gz
sdk-e6aac48c7da09c20abcafba8ab003848aa8448bc.tar.bz2
Merge "Move to the new LayoutlibCallback." into studio-1.3-dev automerge: 80e3ce8
automerge: bd79a42 * commit 'bd79a42f7f0759858321a930c9faed6140ae85f2': Move to the new LayoutlibCallback.
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java
index 6b842ed..020c666 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java
@@ -34,13 +34,14 @@ import com.android.ide.common.rendering.RenderSecurityManager;
import com.android.ide.common.rendering.api.ActionBarCallback;
import com.android.ide.common.rendering.api.AdapterBinding;
import com.android.ide.common.rendering.api.DataBindingItem;
+import com.android.ide.common.rendering.api.Features;
import com.android.ide.common.rendering.api.ILayoutPullParser;
import com.android.ide.common.rendering.api.IProjectCallback;
+import com.android.ide.common.rendering.api.LayoutlibCallback;
import com.android.ide.common.rendering.api.LayoutLog;
import com.android.ide.common.rendering.api.ResourceReference;
import com.android.ide.common.rendering.api.ResourceValue;
import com.android.ide.common.rendering.api.Result;
-import com.android.ide.common.rendering.legacy.LegacyCallback;
import com.android.ide.common.resources.ResourceResolver;
import com.android.ide.common.xml.ManifestData;
import com.android.ide.eclipse.adt.AdtConstants;
@@ -76,9 +77,9 @@ import java.util.TreeSet;
/**
* Loader for Android Project class in order to use them in the layout editor.
* <p/>This implements {@link IProjectCallback} for the old and new API through
- * {@link LegacyCallback}
+ * {@link LayoutlibCallback}
*/
-public final class ProjectCallback extends LegacyCallback {
+public final class ProjectCallback extends LayoutlibCallback {
private final HashMap<String, Class<?>> mLoadedClasses = new HashMap<String, Class<?>>();
private final Set<String> mMissingClasses = new TreeSet<String>();
private final Set<String> mBrokenClasses = new TreeSet<String>();
@@ -151,7 +152,7 @@ public final class ProjectCallback extends LegacyCallback {
@SuppressWarnings("unchecked")
public Object loadView(String className, Class[] constructorSignature,
Object[] constructorParameters)
- throws ClassNotFoundException, Exception {
+ throws Exception {
mUsed = true;
if (className == null) {
@@ -684,4 +685,9 @@ public final class ProjectCallback extends LegacyCallback {
public ActionBarCallback getActionBarCallback() {
return new ActionBarHandler(mEditor);
}
+
+ @Override
+ public boolean supports(int feature) {
+ return feature <= Features.LAST_CAPABILITY;
+ }
}