Extract layout constants into a separate constants class

Combine the constants in BaseView and a LayoutConstants class over in
the internal packages into a new LayoutConstants class, and reference
these constants elsewhere (statically imported). This was suggested by
in the feedback to review #18971.

Change-Id: I40b76f8f6045c34a98f7a2363f96d2942360d1f3

7 files changed, 46 insertions, 28 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java
index ee2fcc7..a6d6384 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java
@@ -16,6 +16,8 @@
 
 package com.android.ide.common.layout;
 
+import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
+
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.Point;
 import com.android.ide.common.api.Rect;
@@ -56,8 +58,8 @@ public class AbsoluteLayoutRuleTest extends LayoutTestBase {
                 // Drop preview
                 "useStyle(DROP_PREVIEW), drawRect(Rect[-22,-50,105,80])");
 
-        assertEquals("-22dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_x"));
-        assertEquals("-50dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_y"));
+        assertEquals("-22dip", inserted.getStringAttr(ANDROID_URI, "layout_x"));
+        assertEquals("-50dip", inserted.getStringAttr(ANDROID_URI, "layout_y"));
 
         // Without drag bounds we should just draw guide lines instead
         inserted = dragInto(new Rect(0, 0, 0, 0), new Point(30, -10), 4, -1,
@@ -66,8 +68,8 @@ public class AbsoluteLayoutRuleTest extends LayoutTestBase {
                 "useStyle(GUIDELINE), drawLine(30,0,30,480), drawLine(0,-10,240,-10)",
                 // Drop preview
                 "useStyle(DROP_PREVIEW), drawLine(30,-10,240,-10), drawLine(30,-10,30,480)");
-        assertEquals("30dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_x"));
-        assertEquals("-10dip", inserted.getStringAttr(BaseLayout.ANDROID_URI, "layout_y"));
+        assertEquals("30dip", inserted.getStringAttr(ANDROID_URI, "layout_x"));
+        assertEquals("-10dip", inserted.getStringAttr(ANDROID_URI, "layout_y"));
     }
 
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutTest.java
index 8ac6c58..7540e4e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutTest.java
@@ -16,6 +16,9 @@
 
 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_ID;
+
 import com.android.ide.common.api.IDragElement;
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.Rect;
@@ -64,7 +67,7 @@ public class BaseLayoutTest extends LayoutTestBase {
      */
     public final void testCollectIds2() {
         IDragElement[] elements = TestDragElement.create(TestDragElement.create(
-                "android.widget.Button", new Rect(0, 0, 100, 80)).set("myuri", BaseView.ATTR_ID,
+                "android.widget.Button", new Rect(0, 0, 100, 80)).set("myuri", ATTR_ID,
                 "@+id/Button01"));
 
         Map<String, Pair<String, String>> idMap = new HashMap<String, Pair<String, String>>();
@@ -217,9 +220,9 @@ public class BaseLayoutTest extends LayoutTestBase {
     public final void testDefaultAttributeFilter() {
         assertEquals("true", BaseLayout.DEFAULT_ATTR_FILTER.replace("myuri", "layout_alignRight",
                 "true"));
-        assertEquals(null, BaseLayout.DEFAULT_ATTR_FILTER.replace(BaseLayout.ANDROID_URI,
+        assertEquals(null, BaseLayout.DEFAULT_ATTR_FILTER.replace(ANDROID_URI,
                 "layout_alignRight", "true"));
-        assertEquals("true", BaseLayout.DEFAULT_ATTR_FILTER.replace(BaseLayout.ANDROID_URI,
+        assertEquals("true", BaseLayout.DEFAULT_ATTR_FILTER.replace(ANDROID_URI,
                 "myproperty", "true"));
     }
 
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 be3c196..d6161b1 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
@@ -16,6 +16,8 @@
 
 
 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_ID;
 
 import com.android.ide.common.api.DropFeedback;
 import com.android.ide.common.api.IDragElement;
@@ -35,9 +37,6 @@ import junit.framework.TestCase;
  * Common layout helpers from LayoutRule tests
  */
 public abstract class LayoutTestBase extends TestCase {
-    public static String ANDROID_URI = BaseView.ANDROID_URI;
-    public static String ATTR_ID = BaseView.ATTR_ID;
-
     /**
      * Helper function used by tests to drag a button into a canvas containing
      * the given children.
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 489d12c..520f984 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
@@ -16,15 +16,21 @@
 
 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_ID;
+import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION;
+import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL;
+import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL;
+
 import com.android.ide.common.api.DropFeedback;
 import com.android.ide.common.api.IDragElement;
 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;
 
@@ -84,7 +90,7 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
         rule.onDropped(targetNode, elements, feedback, dropPoint);
         assertEquals(1, targetNode.getChildren().length);
         assertEquals("@+id/Button01", targetNode.getChildren()[0].getStringAttr(
-                BaseView.ANDROID_URI, BaseView.ATTR_ID));
+                ANDROID_URI, ATTR_ID));
     }
 
     // Utility for other tests
@@ -92,9 +98,9 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
             int insertIndex, int currentIndex,
             String... graphicsFragments) {
         INode linearLayout = TestNode.create("android.widget.LinearLayout").id(
-                "@+id/LinearLayout01").bounds(new Rect(0, 0, 240, 480)).set(BaseView.ANDROID_URI,
-                LinearLayoutRule.ATTR_ORIENTATION,
-                vertical ? LinearLayoutRule.VALUE_VERTICAL : LinearLayoutRule.VALUE_HORIZONTAL)
+                "@+id/LinearLayout01").bounds(new Rect(0, 0, 240, 480)).set(ANDROID_URI,
+                ATTR_ORIENTATION,
+                vertical ? VALUE_VERTICAL : VALUE_HORIZONTAL)
                 .add(
                         TestNode.create("android.widget.Button").id("@+id/Button01").bounds(
                                 new Rect(0, 0, 100, 80)),
@@ -131,7 +137,7 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
         LinearLayoutRule rule = new LinearLayoutRule();
         INode node = TestNode.create("android.widget.Button").id("@+id/Button012");
 
-        assertNull(node.getStringAttr(BaseView.ANDROID_URI, LinearLayoutRule.ATTR_ORIENTATION));
+        assertNull(node.getStringAttr(ANDROID_URI, ATTR_ORIENTATION));
 
         List<MenuAction> contextMenu = rule.getContextMenu(node);
         assertEquals(4, contextMenu.size());
@@ -142,14 +148,14 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
 
         MenuAction.Choices choices = (Choices) orientationAction;
         IMenuCallback callback = choices.getCallback();
-        callback.action(orientationAction, LinearLayoutRule.VALUE_VERTICAL, true);
-
-        String orientation = node.getStringAttr(BaseView.ANDROID_URI,
-                LinearLayoutRule.ATTR_ORIENTATION);
-        assertEquals(LinearLayoutRule.VALUE_VERTICAL, orientation);
-        callback.action(orientationAction, LinearLayoutRule.VALUE_HORIZONTAL, true);
-        orientation = node.getStringAttr(BaseView.ANDROID_URI, LinearLayoutRule.ATTR_ORIENTATION);
-        assertEquals(LinearLayoutRule.VALUE_HORIZONTAL, orientation);
+        callback.action(orientationAction, VALUE_VERTICAL, true);
+
+        String orientation = node.getStringAttr(ANDROID_URI,
+                ATTR_ORIENTATION);
+        assertEquals(VALUE_VERTICAL, orientation);
+        callback.action(orientationAction, VALUE_HORIZONTAL, true);
+        orientation = node.getStringAttr(ANDROID_URI, ATTR_ORIENTATION);
+        assertEquals(VALUE_HORIZONTAL, orientation);
     }
 
     public void testDragInEmptyWithBounds() {
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java
index 0ebec70..f04538a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java
@@ -16,6 +16,8 @@
 
 package com.android.ide.common.layout;
 
+import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI;
+
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.Point;
 import com.android.ide.common.api.Rect;
@@ -76,7 +78,7 @@ public class RelativeLayoutRuleTest extends LayoutTestBase {
                 // Drop preview
                 "useStyle(DROP_PREVIEW), drawRect(Rect[0,0,105,80])");
 
-        assertEquals("true", inserted.getStringAttr(BaseLayout.ANDROID_URI,
+        assertEquals("true", inserted.getStringAttr(ANDROID_URI,
                 "layout_alignParentTop"));
     }
 
@@ -144,7 +146,7 @@ public class RelativeLayoutRuleTest extends LayoutTestBase {
                 String[] elements = attachment.split("=");
                 String name = "layout_" + elements[0];
                 String value = elements[1];
-                assertEquals(value, inserted.getStringAttr(BaseLayout.ANDROID_URI, name));
+                assertEquals(value, inserted.getStringAttr(ANDROID_URI, name));
             }
         }
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java
index b113ced..2c65317 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java
@@ -15,6 +15,9 @@
  */
 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_ID;
+
 import com.android.ide.common.api.IDragElement;
 import com.android.ide.common.api.Rect;
 
@@ -79,7 +82,7 @@ public class TestDragElement implements IDragElement {
     }
 
     public TestDragElement id(String id) {
-        return set(BaseView.ANDROID_URI, BaseView.ATTR_ID, id);
+        return set(ANDROID_URI, ATTR_ID, id);
     }
 
     public static TestDragElement create(String fqn, Rect bounds) {
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java
index 21250de..14430a5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java
@@ -15,6 +15,9 @@
  */
 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_ID;
+
 import com.android.ide.common.api.IAttributeInfo;
 import com.android.ide.common.api.INode;
 import com.android.ide.common.api.INodeHandler;
@@ -50,7 +53,7 @@ public class TestNode implements INode {
     }
 
     public TestNode id(String id) {
-        return set(BaseView.ANDROID_URI, BaseView.ATTR_ID, id);
+        return set(ANDROID_URI, ATTR_ID, id);
     }
 
     public TestNode set(String uri, String name, String value) {