From 85e4a1a9dd133abb879ec211ce8dd385004edf22 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet 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 --- sdkmanager/app/src/com/android/sdkmanager/Main.java | 2 +- sdkmanager/app/tests/com/android/sdkmanager/MainTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sdkmanager/app') diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 3d08574..8d945d7 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -49,7 +49,7 @@ import com.android.sdkuilib.repository.AvdManagerWindow; import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext; import com.android.sdkuilib.repository.SdkUpdaterWindow; import com.android.sdkuilib.repository.SdkUpdaterWindow.SdkInvocationContext; -import com.android.util.Pair; +import com.android.utils.Pair; import org.eclipse.swt.widgets.Display; import org.xml.sax.InputSource; diff --git a/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java b/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java index 74cc1cb..2e5aafd 100644 --- a/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java +++ b/sdkmanager/app/tests/com/android/sdkmanager/MainTest.java @@ -23,7 +23,7 @@ import com.android.sdklib.SdkManagerTestCase; import com.android.sdklib.internal.avd.AvdInfo; import com.android.sdklib.repository.SdkAddonConstants; import com.android.sdklib.repository.SdkRepoConstants; -import com.android.util.Pair; +import com.android.utils.Pair; import java.io.File; import java.util.ArrayList; -- cgit v1.1