LayoutLib API: move add/moveChild API back to using index.

Also add an optional data bundle to SceneResult.

Change-Id: I9f9d4ca1f1f05d536a87a005a7939a6d42d0d8a4

1 files changed, 3 insertions, 2 deletions

diff --git a/ide_common/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java b/ide_common/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java
index e1b8241..f773a5a 100644
--- a/ide_common/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java
+++ b/ide_common/src/com/android/ide/common/layoutlib/LayoutBridgeWrapper.java
@@ -25,6 +25,7 @@ import com.android.layoutlib.api.SceneResult;
 import com.android.layoutlib.api.ViewInfo;
 import com.android.layoutlib.api.ILayoutResult.ILayoutViewInfo;
 import com.android.layoutlib.api.SceneParams.RenderingMode;
+import com.android.layoutlib.api.SceneResult.SceneStatus;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -146,10 +147,10 @@ class LayoutBridgeWrapper extends LayoutBridge {
         ViewInfo rootViewInfo;
 
         if (result.getSuccess() == ILayoutResult.SUCCESS) {
-            sceneResult = SceneResult.SUCCESS;
+            sceneResult = SceneStatus.SUCCESS.getResult();
             rootViewInfo = convertToViewInfo(result.getRootView());
         } else {
-            sceneResult = new SceneResult(result.getErrorMessage());
+            sceneResult = new SceneResult(SceneStatus.ERROR_UNKNOWN, result.getErrorMessage());
             rootViewInfo = null;
         }