Merge "Issue 13051: Use match_parent or fill_parent based on API level"

12 files changed, 132 insertions, 34 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java
index a17af01..a8c131b 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java
@@ -33,6 +33,8 @@ public interface IClientRulesEngine {
 
     /**
      * Returns the FQCN for which the rule was loaded.
+     *
+     * @return the fully qualified name of the rule
      */
     String getFqcn();
 
@@ -64,6 +66,8 @@ public interface IClientRulesEngine {
 
     /**
      * Displays the given message string in an alert dialog with an "OK" button.
+     *
+     * @param message the message to be shown
      */
     void displayAlert(String message);
 
@@ -80,5 +84,12 @@ public interface IClientRulesEngine {
      */
     @Nullable
     String displayInput(String message, @Nullable String value, @Nullable IValidator filter);
+
+    /**
+     * Returns the minimum API level that the current Android project is targeting.
+     *
+     * @return the minimum API level to be supported, or -1 if it cannot be determined
+     */
+    int getMinApiLevel();
 }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
index 51eb369..b712ce5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
@@ -100,9 +100,13 @@ public class BaseViewRule implements IViewRule {
         String custom_w = "Custom...";
         String curr_w = selectedNode.getStringAttr(ANDROID_URI, ATTR_LAYOUT_WIDTH);
 
-        if (VALUE_FILL_PARENT.equals(curr_w)) {
+        String fillParent = getFillParentValueName();
+        boolean canMatchParent = supportsMatchParent();
+        if (canMatchParent && VALUE_FILL_PARENT.equals(curr_w)) {
             curr_w = VALUE_MATCH_PARENT;
-        } else if (!VALUE_WRAP_CONTENT.equals(curr_w) && !VALUE_MATCH_PARENT.equals(curr_w)) {
+        } else if (!canMatchParent && VALUE_MATCH_PARENT.equals(curr_w)) {
+            curr_w = VALUE_FILL_PARENT;
+        } else if (!VALUE_WRAP_CONTENT.equals(curr_w) && !fillParent.equals(curr_w)) {
             curr_w = "zcustom"; //$NON-NLS-1$
             custom_w = "Custom: " + curr_w;
         }
@@ -110,9 +114,11 @@ public class BaseViewRule implements IViewRule {
         String custom_h = "Custom...";
         String curr_h = selectedNode.getStringAttr(ANDROID_URI, ATTR_LAYOUT_HEIGHT);
 
-        if (VALUE_FILL_PARENT.equals(curr_h)) {
+        if (canMatchParent && VALUE_FILL_PARENT.equals(curr_h)) {
             curr_h = VALUE_MATCH_PARENT;
-        } else if (!VALUE_WRAP_CONTENT.equals(curr_h) && !VALUE_MATCH_PARENT.equals(curr_h)) {
+        } else if (!canMatchParent && VALUE_MATCH_PARENT.equals(curr_h)) {
+            curr_h = VALUE_FILL_PARENT;
+        } else if (!VALUE_WRAP_CONTENT.equals(curr_h) && !fillParent.equals(curr_h)) {
             curr_h = "zcustom"; //$NON-NLS-1$
             custom_h = "Custom: " + curr_h;
         }
@@ -200,16 +206,18 @@ public class BaseViewRule implements IViewRule {
         List<MenuAction> list1 = Arrays.asList(new MenuAction[] {
             new MenuAction.Choices("layout_1width", "Layout Width", //$NON-NLS-1$
                     mapify(
-                      "wrap_content", "Wrap Content", //$NON-NLS-1$
-                      "match_parent", "Match Parent", //$NON-NLS-1$
+                      VALUE_WRAP_CONTENT, "Wrap Content",
+                      canMatchParent ? VALUE_MATCH_PARENT : VALUE_FILL_PARENT,
+                      canMatchParent ? "Match Parent" : "Fill Parent",
                       "zcustom", custom_w             //$NON-NLS-1$
                     ),
                     curr_w,
                     onChange ),
            new MenuAction.Choices("layout_2height", "Layout Height", //$NON-NLS-1$
                    mapify(
-                      "wrap_content", "Wrap Content", //$NON-NLS-1$
-                      "match_parent", "Match Parent", //$NON-NLS-1$
+                      VALUE_WRAP_CONTENT, "Wrap Content",
+                      canMatchParent ? VALUE_MATCH_PARENT : VALUE_FILL_PARENT,
+                      canMatchParent ? "Match Parent" : "Fill Parent",
                       "zcustom", custom_h             //$NON-NLS-1$
                    ),
                     curr_h,
@@ -321,6 +329,26 @@ public class BaseViewRule implements IViewRule {
         return concatenate(list1, list2);
     }
 
+    /**
+     * Returns fill_parent or match_parent, depending on whether the minimum supported
+     * platform supports match_parent or not
+     *
+     * @return match_parent or fill_parent depending on which is supported by the project
+     */
+    protected String getFillParentValueName() {
+        return supportsMatchParent() ? VALUE_MATCH_PARENT : VALUE_FILL_PARENT;
+    }
+
+    /**
+     * Returns true if the project supports match_parent instead of just fill_parent
+     *
+     * @return true if the project supports match_parent instead of just fill_parent
+     */
+    protected boolean supportsMatchParent() {
+        // fill_parent was renamed match_parent in API level 8
+        return mRulesEngine.getMinApiLevel() >= 8;
+    }
+
     /** Join strings into a single string with the given delimiter */
     static String join(char delimiter, Collection<String> strings) {
         StringBuilder sb = new StringBuilder(100);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java
index 4c1af19..b3cf5ce 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java
@@ -22,7 +22,6 @@ import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT;
 import static com.android.ide.common.layout.LayoutConstants.FQCN_EDIT_TEXT;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.IViewRule;
@@ -39,17 +38,18 @@ public class DialerFilterRule extends BaseViewRule {
 
         // A DialerFilter requires a couple of nested EditTexts with fixed ids:
         if (insertType == InsertType.CREATE) {
+            String fillParent = getFillParentValueName();
             INode hint = node.appendChild(FQCN_EDIT_TEXT);
             hint.setAttribute(ANDROID_URI, ATTR_TEXT, "Hint");
             hint.setAttribute(ANDROID_URI, ATTR_ID, "@android:id/hint"); //$NON-NLS-1$
-            hint.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
+            hint.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
 
             INode primary = node.appendChild(FQCN_EDIT_TEXT);
             primary.setAttribute(ANDROID_URI, ATTR_TEXT, "Primary");
             primary.setAttribute(ANDROID_URI, ATTR_ID, "@android:id/primary"); //$NON-NLS-1$
             primary.setAttribute(ANDROID_URI, ATTR_LAYOUT_BELOW,
                     "@android:id/hint"); //$NON-NLS-1$
-            primary.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
+            primary.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
 
 
             // What do we initialize the icon to?
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java
index f7fc6c5..71bd704 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java
@@ -21,7 +21,6 @@ import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION;
 import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL;
 
 import com.android.ide.common.api.INode;
@@ -38,8 +37,9 @@ public class HorizontalScrollViewRule extends FrameLayoutRule {
         super.onChildInserted(child, parent, insertType);
 
         // The child of the ScrollView should fill in both directions
-        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
-        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT);
+        String fillParent = getFillParentValueName();
+        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
+        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent);
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java
index d797677..995d206 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java
@@ -20,7 +20,6 @@ import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL;
 
@@ -33,12 +32,12 @@ import com.android.ide.common.api.IMenuCallback;
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.INodeHandler;
 import com.android.ide.common.api.IViewMetadata;
-import com.android.ide.common.api.IViewMetadata.FillPreference;
 import com.android.ide.common.api.IViewRule;
 import com.android.ide.common.api.InsertType;
 import com.android.ide.common.api.MenuAction;
 import com.android.ide.common.api.Point;
 import com.android.ide.common.api.Rect;
+import com.android.ide.common.api.IViewMetadata.FillPreference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -425,11 +424,12 @@ public class LinearLayoutRule extends BaseLayoutRule {
         if (metadata != null) {
             boolean vertical = isVertical(parent);
             FillPreference fill = metadata.getFillPreference();
+            String fillParent = getFillParentValueName();
             if (fill.fillHorizontally(vertical)) {
-                node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
+                node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
             }
             if (fill.fillVertically(vertical)) {
-                node.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT);
+                node.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent);
             }
         }
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java
index c83e294..aee94bc 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java
@@ -18,7 +18,6 @@ package com.android.ide.common.layout;
 
 import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.IViewRule;
@@ -35,6 +34,6 @@ public class ListViewRule extends BaseViewRule {
     public void onCreate(INode node, INode parent, InsertType insertType) {
         super.onCreate(node, parent, insertType);
 
-        node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
+        node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, getFillParentValueName());
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java
index 822c1cb..e3c349a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java
@@ -20,7 +20,6 @@ import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
 import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.IViewRule;
@@ -36,8 +35,9 @@ public class ScrollViewRule extends FrameLayoutRule {
         super.onChildInserted(child, parent, insertType);
 
         // The child of the ScrollView should fill in both directions
-        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
-        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT);
+        String fillParent = getFillParentValueName();
+        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
+        child.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent);
     }
 
     @Override
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java
index 40fb608..3324697 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java
@@ -18,7 +18,6 @@ package com.android.ide.common.layout;
 
 import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.IViewRule;
@@ -35,7 +34,7 @@ public class SeekBarRule extends BaseViewRule {
 
         // A SeekBar isn't useful with wrap_content because it packs itself down to
         // almost no usable width -- so just make it grow in all layouts
-        node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
+        node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, getFillParentValueName());
     }
 
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java
index dc512bd..9f8ea80 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java
@@ -24,7 +24,6 @@ import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION;
 import static com.android.ide.common.layout.LayoutConstants.FQCN_FRAME_LAYOUT;
 import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT;
 import static com.android.ide.common.layout.LayoutConstants.FQCN_TAB_WIDGET;
-import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT;
 
@@ -45,25 +44,27 @@ public class TabHostRule extends IgnoredLayoutRule {
         super.onCreate(node, parent, insertType);
 
         if (insertType == InsertType.CREATE) {
+            String fillParent = getFillParentValueName();
+
             // Configure default Table setup as described in the Table tutorial
             node.setAttribute(ANDROID_URI, ATTR_ID, "@android:id/tabhost"); //$NON-NLS-1$
-            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
-            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT);
+            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
+            node.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent);
 
             INode linear = node.appendChild(FQCN_LINEAR_LAYOUT);
-            linear.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
-            linear.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT);
+            linear.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
+            linear.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent);
             linear.setAttribute(ANDROID_URI, ATTR_ORIENTATION,
                     VALUE_VERTICAL);
 
             INode tab = linear.appendChild(FQCN_TAB_WIDGET);
-            tab.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
+            tab.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
             tab.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_WRAP_CONTENT);
             tab.setAttribute(ANDROID_URI, ATTR_ID, "@android:id/tabs"); //$NON-NLS-1$
 
             INode frame = linear.appendChild(FQCN_FRAME_LAYOUT);
-            frame.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT);
-            frame.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT);
+            frame.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent);
+            frame.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent);
             frame.setAttribute(ANDROID_URI, ATTR_ID, "@android:id/tabcontent"); //$NON-NLS-1$
         }
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java
index d84ed0d..ff6cbfe 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java
@@ -772,5 +772,15 @@ public class RulesEngine {
         public IViewMetadata getMetadata(final String fqcn) {
             return new ViewMetadata(mEditor.getLayoutEditor(), fqcn);
         }
+
+        public int getMinApiLevel() {
+            Sdk currentSdk = Sdk.getCurrent();
+            if (currentSdk != null) {
+                IAndroidTarget target = currentSdk.getTarget(mEditor.getProject());
+                return target.getVersion().getApiLevel();
+            }
+
+            return -1;
+        }
     }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java
index d6161b1..50d71fc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java
@@ -20,8 +20,11 @@ import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_ID;
 
 import com.android.ide.common.api.DropFeedback;
+import com.android.ide.common.api.IClientRulesEngine;
 import com.android.ide.common.api.IDragElement;
 import com.android.ide.common.api.INode;
+import com.android.ide.common.api.IValidator;
+import com.android.ide.common.api.IViewMetadata;
 import com.android.ide.common.api.IViewRule;
 import com.android.ide.common.api.Point;
 import com.android.ide.common.api.Rect;
@@ -178,4 +181,48 @@ public abstract class LayoutTestBase extends TestCase {
             assertEquals("Collections differ; first difference:", expectedElement, actualElement);
         }
     }
+
+    protected void initialize(IViewRule rule, String fqn) {
+        rule.onInitialize(fqn, new TestRulesEngine(fqn));
+    }
+
+    private static class TestRulesEngine implements IClientRulesEngine {
+        private final String mFqn;
+
+        protected TestRulesEngine(String fqn) {
+            mFqn = fqn;
+        }
+
+        public void debugPrintf(String msg, Object... params) {
+            fail("Not supported in tests yet");
+        }
+
+        public void displayAlert(String message) {
+            fail("Not supported in tests yet");
+        }
+
+        public String displayInput(String message, String value, IValidator filter) {
+            fail("Not supported in tests yet");
+            return null;
+        }
+
+        public String getFqcn() {
+            return mFqn;
+        }
+
+        public IViewMetadata getMetadata(String fqcn) {
+            fail("Not supported in tests yet");
+            return null;
+        }
+
+        public int getMinApiLevel() {
+            return 8;
+        }
+
+        public IViewRule loadRule(String fqcn) {
+            fail("Not supported in tests yet");
+            return null;
+        }
+
+    }
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java
index 520f984..4f29932 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java
@@ -28,9 +28,9 @@ import com.android.ide.common.api.IMenuCallback;
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.IViewRule;
 import com.android.ide.common.api.MenuAction;
-import com.android.ide.common.api.MenuAction.Choices;
 import com.android.ide.common.api.Point;
 import com.android.ide.common.api.Rect;
+import com.android.ide.common.api.MenuAction.Choices;
 
 import java.util.List;
 
@@ -41,6 +41,7 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
         boolean haveBounds = dragBounds.isValid();
 
         IViewRule rule = new LinearLayoutRule();
+
         INode targetNode = TestNode.create("android.widget.LinearLayout").id(
         "@+id/LinearLayout01").bounds(new Rect(0, 0, 240, 480));
         Point dropPoint = new Point(10, 5);
@@ -118,6 +119,7 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
     // Check that the context menu registers the expected menu items
     public void testContextMenu() {
         LinearLayoutRule rule = new LinearLayoutRule();
+        initialize(rule, "android.widget.LinearLayout");
         INode node = TestNode.create("android.widget.Button").id("@+id/Button012");
 
         List<MenuAction> contextMenu = rule.getContextMenu(node);
@@ -135,6 +137,7 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
     // Check that the context menu manipulates the orientation attribute
     public void testOrientation() {
         LinearLayoutRule rule = new LinearLayoutRule();
+        initialize(rule, "android.widget.LinearLayout");
         INode node = TestNode.create("android.widget.Button").id("@+id/Button012");
 
         assertNull(node.getStringAttr(ANDROID_URI, ATTR_ORIENTATION));