From 85e4a1a9dd133abb879ec211ce8dd385004edf22 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 7 Aug 2012 16:30:38 -0700
Subject: 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
---
 apigenerator/src/com/android/apigenerator/AndroidJarReader.java | 2 +-
 apigenerator/src/com/android/apigenerator/ApiClass.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'apigenerator/src')

diff --git a/apigenerator/src/com/android/apigenerator/AndroidJarReader.java b/apigenerator/src/com/android/apigenerator/AndroidJarReader.java
index 89924a5..07a3ce6 100644
--- a/apigenerator/src/com/android/apigenerator/AndroidJarReader.java
+++ b/apigenerator/src/com/android/apigenerator/AndroidJarReader.java
@@ -16,7 +16,7 @@
 
 package com.android.apigenerator;
 
-import com.android.util.Pair;
+import com.android.utils.Pair;
 
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Opcodes;
diff --git a/apigenerator/src/com/android/apigenerator/ApiClass.java b/apigenerator/src/com/android/apigenerator/ApiClass.java
index ccdc075..50ee8c8 100644
--- a/apigenerator/src/com/android/apigenerator/ApiClass.java
+++ b/apigenerator/src/com/android/apigenerator/ApiClass.java
@@ -16,7 +16,7 @@
 
 package com.android.apigenerator;
 
-import com.android.util.Pair;
+import com.android.utils.Pair;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
-- 
cgit v1.1