Refactor common.jar

Move resources and com.android.util.Pair into layoutlib_api
where they belong since layoutlib depends on them and we need
to control the API.

Made a copy of Pair to stay in common.jar but moved it to
com.android.utils.Pair (the one in com.android.util.Pair is
marked as deprecated to prevent usage where applicable).

Also moved XmlUtil and PositionXmlParser to com.android.utils
to match Pair.

Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89

3 files changed, 6 insertions, 47 deletions

diff --git a/common/tests/src/com/android/resources/FolderTypeRelationShipTest.java b/common/tests/src/com/android/resources/FolderTypeRelationShipTest.java
deleted file mode 100644
index 809eae7..0000000
--- a/common/tests/src/com/android/resources/FolderTypeRelationShipTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.resources;
-
-import com.android.resources.FolderTypeRelationship;
-import com.android.resources.ResourceFolderType;
-import com.android.resources.ResourceType;
-
-import junit.framework.TestCase;
-
-public class FolderTypeRelationShipTest extends TestCase {
-
-    public void testResourceType() {
-        // all resource type should be in the FolderTypeRelationShip map.
-        // loop on all the enum, and make sure there's at least one folder type for it.
-        for (ResourceType type : ResourceType.values()) {
-            assertTrue(type.getDisplayName(),
-                    FolderTypeRelationship.getRelatedFolders(type).size() > 0);
-        }
-    }
-
-    public void testResourceFolderType() {
-        // all resource folder type should generate at least one type of resource.
-        // loop on all the enum, and make sure there's at least one res type for it.
-        for (ResourceFolderType type : ResourceFolderType.values()) {
-            assertTrue(type.getName(),
-                    FolderTypeRelationship.getRelatedResourceTypes(type).size() > 0);
-        }
-    }
-}
diff --git a/common/tests/src/com/android/util/PositionXmlParserTest.java b/common/tests/src/com/android/utils/PositionXmlParserTest.java
index 961d7d6..7d5b78b 100644
--- a/common/tests/src/com/android/util/PositionXmlParserTest.java
+++ b/common/tests/src/com/android/utils/PositionXmlParserTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.util;
+package com.android.utils;
 
-import com.android.util.PositionXmlParser.Position;
+import com.android.utils.PositionXmlParser;
+import com.android.utils.PositionXmlParser.Position;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
diff --git a/common/tests/src/com/android/util/XmlUtilsTest.java b/common/tests/src/com/android/utils/XmlUtilsTest.java
index 655829b..a4758a5 100644
--- a/common/tests/src/com/android/util/XmlUtilsTest.java
+++ b/common/tests/src/com/android/utils/XmlUtilsTest.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.util;
+package com.android.utils;
+
+import com.android.utils.XmlUtils;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;