diff options
-rw-r--r-- | build/product_sdk.mk | 2 | ||||
-rw-r--r-- | build/sdk_only_whitelist.mk | 2 | ||||
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/.classpath | 2 | ||||
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.tests/.classpath | 2 | ||||
-rwxr-xr-x | eclipse/scripts/create_all_symlinks.sh | 2 | ||||
-rw-r--r-- | layoutlib_api/sample/.classpath | 2 | ||||
-rw-r--r-- | layoutlib_api/sample/src/com/example/android/render/Main.java | 2 | ||||
-rw-r--r-- | lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java | 2 | ||||
-rw-r--r-- | sdk_common/.classpath (renamed from ide_common/.classpath) | 0 | ||||
-rw-r--r-- | sdk_common/.gitignore (renamed from ide_common/.gitignore) | 0 | ||||
-rw-r--r-- | sdk_common/.project (renamed from ide_common/.project) | 2 | ||||
-rw-r--r-- | sdk_common/.settings/org.eclipse.jdt.core.prefs (renamed from ide_common/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
-rw-r--r-- | sdk_common/Android.mk (renamed from ide_common/Android.mk) | 2 | ||||
-rw-r--r-- | sdk_common/NOTICE (renamed from ide_common/NOTICE) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/rendering/LayoutLibrary.java (renamed from ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/rendering/StaticRenderSession.java (renamed from ide_common/src/com/android/ide/common/rendering/StaticRenderSession.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/rendering/legacy/ILegacyPullParser.java (renamed from ide_common/src/com/android/ide/common/rendering/legacy/ILegacyPullParser.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java (renamed from ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/FrameworkResourceItem.java (renamed from ide_common/src/com/android/ide/common/resources/FrameworkResourceItem.java) | 0 | ||||
-rwxr-xr-x | sdk_common/src/com/android/ide/common/resources/FrameworkResources.java (renamed from ide_common/src/com/android/ide/common/resources/FrameworkResources.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/IdGeneratingResourceFile.java (renamed from ide_common/src/com/android/ide/common/resources/IdGeneratingResourceFile.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/IdResourceParser.java (renamed from ide_common/src/com/android/ide/common/resources/IdResourceParser.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/InlineResourceItem.java (renamed from ide_common/src/com/android/ide/common/resources/InlineResourceItem.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/IntArrayWrapper.java (renamed from ide_common/src/com/android/ide/common/resources/IntArrayWrapper.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/MultiResourceFile.java (renamed from ide_common/src/com/android/ide/common/resources/MultiResourceFile.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ResourceDeltaKind.java (renamed from ide_common/src/com/android/ide/common/resources/ResourceDeltaKind.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ResourceFile.java (renamed from ide_common/src/com/android/ide/common/resources/ResourceFile.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ResourceFolder.java (renamed from ide_common/src/com/android/ide/common/resources/ResourceFolder.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ResourceItem.java (renamed from ide_common/src/com/android/ide/common/resources/ResourceItem.java) | 0 | ||||
-rwxr-xr-x | sdk_common/src/com/android/ide/common/resources/ResourceRepository.java (renamed from ide_common/src/com/android/ide/common/resources/ResourceRepository.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ResourceResolver.java (renamed from ide_common/src/com/android/ide/common/resources/ResourceResolver.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ScanningContext.java (renamed from ide_common/src/com/android/ide/common/resources/ScanningContext.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/SingleResourceFile.java (renamed from ide_common/src/com/android/ide/common/resources/SingleResourceFile.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/ValueResourceParser.java (renamed from ide_common/src/com/android/ide/common/resources/ValueResourceParser.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/Configurable.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/Configurable.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/CountryCodeQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/CountryCodeQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/DensityQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/DensityQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/DeviceConfigHelper.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/DeviceConfigHelper.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/EnumBasedResourceQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/EnumBasedResourceQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/KeyboardStateQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/KeyboardStateQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/NavigationMethodQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/NavigationMethodQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/NavigationStateQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/NavigationStateQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/NetworkCodeQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/NetworkCodeQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/NightModeQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/NightModeQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ResourceQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ResourceQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ScreenHeightQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ScreenHeightQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ScreenRatioQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ScreenRatioQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/ScreenWidthQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/ScreenWidthQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/SmallestScreenWidthQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/SmallestScreenWidthQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/TextInputMethodQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/TextInputMethodQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/TouchScreenQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/TouchScreenQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/UiModeQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/UiModeQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/resources/configuration/VersionQualifier.java (renamed from ide_common/src/com/android/ide/common/resources/configuration/VersionQualifier.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/sdk/LoadStatus.java (renamed from ide_common/src/com/android/ide/common/sdk/LoadStatus.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/xml/AndroidManifestParser.java (renamed from ide_common/src/com/android/ide/common/xml/AndroidManifestParser.java) | 0 | ||||
-rw-r--r-- | sdk_common/src/com/android/ide/common/xml/ManifestData.java (renamed from ide_common/src/com/android/ide/common/xml/ManifestData.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/.classpath (renamed from ide_common/tests/.classpath) | 2 | ||||
-rw-r--r-- | sdk_common/tests/.project (renamed from ide_common/tests/.project) | 2 | ||||
-rw-r--r-- | sdk_common/tests/Android.mk (renamed from ide_common/tests/Android.mk) | 4 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/CountryCodeQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/CountryCodeQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/DockModeQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/DockModeQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/KeyboardStateQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/KeyboardStateQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/LanguageQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/LanguageQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/NavigationMethodQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/NavigationMethodQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/NetworkCodeQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/NetworkCodeQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/PixelDensityQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/PixelDensityQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/RegionQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/RegionQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/TextInputMethodQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/TextInputMethodQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/resources/configuration/TouchScreenQualifierTest.java (renamed from ide_common/tests/src/com/android/ide/common/resources/configuration/TouchScreenQualifierTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/xml/AndroidManifestParserTest.java (renamed from ide_common/tests/src/com/android/ide/common/xml/AndroidManifestParserTest.java) | 0 | ||||
-rw-r--r-- | sdk_common/tests/src/com/android/ide/common/xml/SupportsScreensTest.java (renamed from ide_common/tests/src/com/android/ide/common/xml/SupportsScreensTest.java) | 0 |
82 files changed, 15 insertions, 15 deletions
diff --git a/build/product_sdk.mk b/build/product_sdk.mk index bba8230..dd3702f 100644 --- a/build/product_sdk.mk +++ b/build/product_sdk.mk @@ -43,7 +43,7 @@ PRODUCT_PACKAGES += \ dvlib-tests \ emulator \ hierarchyviewer \ - ide_common \ + sdk_common \ layoutlib_api \ lint \ manifmerger \ diff --git a/build/sdk_only_whitelist.mk b/build/sdk_only_whitelist.mk index 7555161..4b39093 100644 --- a/build/sdk_only_whitelist.mk +++ b/build/sdk_only_whitelist.mk @@ -52,7 +52,7 @@ subdirs += \ sdk/device_validator \ sdk/eclipse/scripts/rcp \ sdk/hierarchyviewer2 \ - sdk/ide_common \ + sdk/sdk_common \ sdk/jarutils \ sdk/layoutlib_api \ sdk/manifmerger \ diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath index 767eff0..d9db63a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath @@ -13,7 +13,7 @@ <classpathentry exported="true" kind="lib" path="libs/layoutlib_api.jar" sourcepath="/layoutlib_api"/> <classpathentry exported="true" kind="lib" path="libs/sdklib.jar" sourcepath="/SdkLib"/> <classpathentry exported="true" kind="lib" path="libs/sdkstats.jar" sourcepath="SdkStatsService"/> - <classpathentry exported="true" kind="lib" path="libs/ide_common.jar" sourcepath="/ide_common"/> + <classpathentry exported="true" kind="lib" path="libs/sdk_common.jar" sourcepath="/sdk_common"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 6e116dd..5188818 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Bundle-ClassPath: ., libs/sdklib.jar, libs/sdkstats.jar, libs/dvlib.jar, - libs/ide_common.jar + libs/sdk_common.jar Export-Package: com.android, com.android.annotations, com.android.dvlib, diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath index 48505ad..a1f505e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath @@ -15,6 +15,6 @@ <classpathentry kind="lib" path="/plugin-base/libs/common.jar" sourcepath="/common"/> <classpathentry kind="lib" path="/plugin-adt/libs/lint_api.jar" sourcepath="/lint-api"/> <classpathentry kind="lib" path="/plugin-adt/libs/lint_checks.jar" sourcepath="/lint-checks"/> - <classpathentry kind="lib" path="/plugin-base/libs/ide_common.jar"/> + <classpathentry kind="lib" path="/plugin-base/libs/sdk_common.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh index 8bda0ff..4e32353 100755 --- a/eclipse/scripts/create_all_symlinks.sh +++ b/eclipse/scripts/create_all_symlinks.sh @@ -109,7 +109,7 @@ CP_FILES="" ### BASE ### BASE_PLUGIN_DEST="sdk/eclipse/plugins/com.android.ide.eclipse.base/libs" -BASE_PLUGIN_LIBS="common sdkstats sdklib dvlib layoutlib_api ide_common" +BASE_PLUGIN_LIBS="common sdkstats sdklib dvlib layoutlib_api sdk_common" BASE_PLUGIN_PREBUILTS="\ prebuilts/misc/common/kxml2/kxml2-2.3.0.jar \ prebuilts/tools/common/commons-compress/commons-compress-1.0.jar \ diff --git a/layoutlib_api/sample/.classpath b/layoutlib_api/sample/.classpath index 53c678b..0f75c98 100644 --- a/layoutlib_api/sample/.classpath +++ b/layoutlib_api/sample/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/misc/common/kxml2/kxml2-2.3.0.jar" sourcepath="/ANDROID_SRC/dalvik/libcore/xml/src/main/java"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/ide_common"/> + <classpathentry combineaccessrules="false" kind="src" path="/sdk_common"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/> <classpathentry kind="output" path="bin"/> diff --git a/layoutlib_api/sample/src/com/example/android/render/Main.java b/layoutlib_api/sample/src/com/example/android/render/Main.java index 93ee8a9..d33ab03 100644 --- a/layoutlib_api/sample/src/com/example/android/render/Main.java +++ b/layoutlib_api/sample/src/com/example/android/render/Main.java @@ -46,7 +46,7 @@ import javax.imageio.ImageIO; /** * Sample code showing how to use the different API used to achieve a layout rendering. - * This requires the following jar: layoutlib_api.jar, common.jar, ide_common.jar, sdklib.jar (altho + * This requires the following jar: layoutlib_api.jar, common.jar, sdk_common.jar, sdklib.jar (altho * we should get rid of this one) and a full SDK (or at leas the platform component). * */ diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java index 7c409fc..a65a263 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java @@ -395,7 +395,7 @@ public class TranslationDetector extends ResourceXmlDetector { // to obtain a FolderConfiguration, then call // getLanguageQualifier() on it, and if not null, call getValue() to get the // actual language value. - // However, we don't have ide_common on the build path for lint, so for now + // However, we don't have sdk_common on the build path for lint, so for now // use a simple guess about what constitutes a language qualifier here: String language = null; diff --git a/ide_common/.classpath b/sdk_common/.classpath index 342ab94..342ab94 100644 --- a/ide_common/.classpath +++ b/sdk_common/.classpath diff --git a/ide_common/.gitignore b/sdk_common/.gitignore index fe99505..fe99505 100644 --- a/ide_common/.gitignore +++ b/sdk_common/.gitignore diff --git a/ide_common/.project b/sdk_common/.project index 83e105b..ea6146d 100644 --- a/ide_common/.project +++ b/sdk_common/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>ide_common</name> + <name>sdk_common</name> <comment></comment> <projects> </projects> diff --git a/ide_common/.settings/org.eclipse.jdt.core.prefs b/sdk_common/.settings/org.eclipse.jdt.core.prefs index d11c211..d11c211 100644 --- a/ide_common/.settings/org.eclipse.jdt.core.prefs +++ b/sdk_common/.settings/org.eclipse.jdt.core.prefs diff --git a/ide_common/Android.mk b/sdk_common/Android.mk index 920d0f0..c3ff376 100644 --- a/ide_common/Android.mk +++ b/sdk_common/Android.mk @@ -24,7 +24,7 @@ LOCAL_JAVA_LIBRARIES := \ kxml2-2.3.0 \ sdklib -LOCAL_MODULE := ide_common +LOCAL_MODULE := sdk_common LOCAL_MODULE_TAGS := optional diff --git a/ide_common/NOTICE b/sdk_common/NOTICE index c5b1efa..c5b1efa 100644 --- a/ide_common/NOTICE +++ b/sdk_common/NOTICE diff --git a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java b/sdk_common/src/com/android/ide/common/rendering/LayoutLibrary.java index 0a353f9..0a353f9 100644 --- a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java +++ b/sdk_common/src/com/android/ide/common/rendering/LayoutLibrary.java diff --git a/ide_common/src/com/android/ide/common/rendering/StaticRenderSession.java b/sdk_common/src/com/android/ide/common/rendering/StaticRenderSession.java index c122c1c..c122c1c 100644 --- a/ide_common/src/com/android/ide/common/rendering/StaticRenderSession.java +++ b/sdk_common/src/com/android/ide/common/rendering/StaticRenderSession.java diff --git a/ide_common/src/com/android/ide/common/rendering/legacy/ILegacyPullParser.java b/sdk_common/src/com/android/ide/common/rendering/legacy/ILegacyPullParser.java index a71e190..a71e190 100644 --- a/ide_common/src/com/android/ide/common/rendering/legacy/ILegacyPullParser.java +++ b/sdk_common/src/com/android/ide/common/rendering/legacy/ILegacyPullParser.java diff --git a/ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java b/sdk_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java index 67e6a7b..67e6a7b 100644 --- a/ide_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java +++ b/sdk_common/src/com/android/ide/common/rendering/legacy/LegacyCallback.java diff --git a/ide_common/src/com/android/ide/common/resources/FrameworkResourceItem.java b/sdk_common/src/com/android/ide/common/resources/FrameworkResourceItem.java index 70bbcef..70bbcef 100644 --- a/ide_common/src/com/android/ide/common/resources/FrameworkResourceItem.java +++ b/sdk_common/src/com/android/ide/common/resources/FrameworkResourceItem.java diff --git a/ide_common/src/com/android/ide/common/resources/FrameworkResources.java b/sdk_common/src/com/android/ide/common/resources/FrameworkResources.java index fbf5926..fbf5926 100755 --- a/ide_common/src/com/android/ide/common/resources/FrameworkResources.java +++ b/sdk_common/src/com/android/ide/common/resources/FrameworkResources.java diff --git a/ide_common/src/com/android/ide/common/resources/IdGeneratingResourceFile.java b/sdk_common/src/com/android/ide/common/resources/IdGeneratingResourceFile.java index 9ff1748..9ff1748 100644 --- a/ide_common/src/com/android/ide/common/resources/IdGeneratingResourceFile.java +++ b/sdk_common/src/com/android/ide/common/resources/IdGeneratingResourceFile.java diff --git a/ide_common/src/com/android/ide/common/resources/IdResourceParser.java b/sdk_common/src/com/android/ide/common/resources/IdResourceParser.java index 1de664e..1de664e 100644 --- a/ide_common/src/com/android/ide/common/resources/IdResourceParser.java +++ b/sdk_common/src/com/android/ide/common/resources/IdResourceParser.java diff --git a/ide_common/src/com/android/ide/common/resources/InlineResourceItem.java b/sdk_common/src/com/android/ide/common/resources/InlineResourceItem.java index 37fdc81..37fdc81 100644 --- a/ide_common/src/com/android/ide/common/resources/InlineResourceItem.java +++ b/sdk_common/src/com/android/ide/common/resources/InlineResourceItem.java diff --git a/ide_common/src/com/android/ide/common/resources/IntArrayWrapper.java b/sdk_common/src/com/android/ide/common/resources/IntArrayWrapper.java index 668c677..668c677 100644 --- a/ide_common/src/com/android/ide/common/resources/IntArrayWrapper.java +++ b/sdk_common/src/com/android/ide/common/resources/IntArrayWrapper.java diff --git a/ide_common/src/com/android/ide/common/resources/MultiResourceFile.java b/sdk_common/src/com/android/ide/common/resources/MultiResourceFile.java index c9a8bc7..c9a8bc7 100644 --- a/ide_common/src/com/android/ide/common/resources/MultiResourceFile.java +++ b/sdk_common/src/com/android/ide/common/resources/MultiResourceFile.java diff --git a/ide_common/src/com/android/ide/common/resources/ResourceDeltaKind.java b/sdk_common/src/com/android/ide/common/resources/ResourceDeltaKind.java index 769b6ea..769b6ea 100644 --- a/ide_common/src/com/android/ide/common/resources/ResourceDeltaKind.java +++ b/sdk_common/src/com/android/ide/common/resources/ResourceDeltaKind.java diff --git a/ide_common/src/com/android/ide/common/resources/ResourceFile.java b/sdk_common/src/com/android/ide/common/resources/ResourceFile.java index 378602a..378602a 100644 --- a/ide_common/src/com/android/ide/common/resources/ResourceFile.java +++ b/sdk_common/src/com/android/ide/common/resources/ResourceFile.java diff --git a/ide_common/src/com/android/ide/common/resources/ResourceFolder.java b/sdk_common/src/com/android/ide/common/resources/ResourceFolder.java index d6464c8..d6464c8 100644 --- a/ide_common/src/com/android/ide/common/resources/ResourceFolder.java +++ b/sdk_common/src/com/android/ide/common/resources/ResourceFolder.java diff --git a/ide_common/src/com/android/ide/common/resources/ResourceItem.java b/sdk_common/src/com/android/ide/common/resources/ResourceItem.java index 49396eb..49396eb 100644 --- a/ide_common/src/com/android/ide/common/resources/ResourceItem.java +++ b/sdk_common/src/com/android/ide/common/resources/ResourceItem.java diff --git a/ide_common/src/com/android/ide/common/resources/ResourceRepository.java b/sdk_common/src/com/android/ide/common/resources/ResourceRepository.java index ac0614d..ac0614d 100755 --- a/ide_common/src/com/android/ide/common/resources/ResourceRepository.java +++ b/sdk_common/src/com/android/ide/common/resources/ResourceRepository.java diff --git a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java b/sdk_common/src/com/android/ide/common/resources/ResourceResolver.java index d742c4a..d742c4a 100644 --- a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java +++ b/sdk_common/src/com/android/ide/common/resources/ResourceResolver.java diff --git a/ide_common/src/com/android/ide/common/resources/ScanningContext.java b/sdk_common/src/com/android/ide/common/resources/ScanningContext.java index e4ed275..e4ed275 100644 --- a/ide_common/src/com/android/ide/common/resources/ScanningContext.java +++ b/sdk_common/src/com/android/ide/common/resources/ScanningContext.java diff --git a/ide_common/src/com/android/ide/common/resources/SingleResourceFile.java b/sdk_common/src/com/android/ide/common/resources/SingleResourceFile.java index 6b663e9..6b663e9 100644 --- a/ide_common/src/com/android/ide/common/resources/SingleResourceFile.java +++ b/sdk_common/src/com/android/ide/common/resources/SingleResourceFile.java diff --git a/ide_common/src/com/android/ide/common/resources/ValueResourceParser.java b/sdk_common/src/com/android/ide/common/resources/ValueResourceParser.java index aabfd35..aabfd35 100644 --- a/ide_common/src/com/android/ide/common/resources/ValueResourceParser.java +++ b/sdk_common/src/com/android/ide/common/resources/ValueResourceParser.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/Configurable.java b/sdk_common/src/com/android/ide/common/resources/configuration/Configurable.java index 5e7f910..5e7f910 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/Configurable.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/Configurable.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/CountryCodeQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/CountryCodeQualifier.java index eb7cc0d..eb7cc0d 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/CountryCodeQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/CountryCodeQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/DensityQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/DensityQualifier.java index a9e4a01..a9e4a01 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/DensityQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/DensityQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/DeviceConfigHelper.java b/sdk_common/src/com/android/ide/common/resources/configuration/DeviceConfigHelper.java index 27eaa01..27eaa01 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/DeviceConfigHelper.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/DeviceConfigHelper.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/EnumBasedResourceQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/EnumBasedResourceQualifier.java index 7bfda2d..7bfda2d 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/EnumBasedResourceQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/EnumBasedResourceQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java b/sdk_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java index e2fe767..e2fe767 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/KeyboardStateQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/KeyboardStateQualifier.java index 1397808..1397808 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/KeyboardStateQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/KeyboardStateQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java index 76514e2..76514e2 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/LanguageQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/NavigationMethodQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/NavigationMethodQualifier.java index f40bc6c..f40bc6c 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/NavigationMethodQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/NavigationMethodQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/NavigationStateQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/NavigationStateQualifier.java index 91b81df..91b81df 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/NavigationStateQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/NavigationStateQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/NetworkCodeQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/NetworkCodeQualifier.java index 1ef2015..1ef2015 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/NetworkCodeQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/NetworkCodeQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/NightModeQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/NightModeQualifier.java index d3b6760..d3b6760 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/NightModeQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/NightModeQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java index bd033bd..bd033bd 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/RegionQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ResourceQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ResourceQualifier.java index 2997c8f..2997c8f 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ResourceQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ResourceQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifier.java index dce6c68..dce6c68 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenHeightQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenHeightQualifier.java index 08bba61..08bba61 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenHeightQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenHeightQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifier.java index 732a078..732a078 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenRatioQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenRatioQualifier.java index b45946b..b45946b 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenRatioQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenRatioQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java index 77193a2..77193a2 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenWidthQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenWidthQualifier.java index ab9134b..ab9134b 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenWidthQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/ScreenWidthQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/SmallestScreenWidthQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/SmallestScreenWidthQualifier.java index 35d1ab1..35d1ab1 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/SmallestScreenWidthQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/SmallestScreenWidthQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/TextInputMethodQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/TextInputMethodQualifier.java index 784d43d..784d43d 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/TextInputMethodQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/TextInputMethodQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/TouchScreenQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/TouchScreenQualifier.java index dce9f1d..dce9f1d 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/TouchScreenQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/TouchScreenQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/UiModeQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/UiModeQualifier.java index 1e302c5..1e302c5 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/UiModeQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/UiModeQualifier.java diff --git a/ide_common/src/com/android/ide/common/resources/configuration/VersionQualifier.java b/sdk_common/src/com/android/ide/common/resources/configuration/VersionQualifier.java index 078d4af..078d4af 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/VersionQualifier.java +++ b/sdk_common/src/com/android/ide/common/resources/configuration/VersionQualifier.java diff --git a/ide_common/src/com/android/ide/common/sdk/LoadStatus.java b/sdk_common/src/com/android/ide/common/sdk/LoadStatus.java index babbd63..babbd63 100644 --- a/ide_common/src/com/android/ide/common/sdk/LoadStatus.java +++ b/sdk_common/src/com/android/ide/common/sdk/LoadStatus.java diff --git a/ide_common/src/com/android/ide/common/xml/AndroidManifestParser.java b/sdk_common/src/com/android/ide/common/xml/AndroidManifestParser.java index 38dc1c4..38dc1c4 100644 --- a/ide_common/src/com/android/ide/common/xml/AndroidManifestParser.java +++ b/sdk_common/src/com/android/ide/common/xml/AndroidManifestParser.java diff --git a/ide_common/src/com/android/ide/common/xml/ManifestData.java b/sdk_common/src/com/android/ide/common/xml/ManifestData.java index 9b68d60..9b68d60 100644 --- a/ide_common/src/com/android/ide/common/xml/ManifestData.java +++ b/sdk_common/src/com/android/ide/common/xml/ManifestData.java diff --git a/ide_common/tests/.classpath b/sdk_common/tests/.classpath index 137f0ad..1e45d8a 100644 --- a/ide_common/tests/.classpath +++ b/sdk_common/tests/.classpath @@ -3,7 +3,7 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry combineaccessrules="false" kind="src" path="/ide_common"/> + <classpathentry combineaccessrules="false" kind="src" path="/sdk_common"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry kind="output" path="bin"/> diff --git a/ide_common/tests/.project b/sdk_common/tests/.project index 1cfa60e..86d2f15 100644 --- a/ide_common/tests/.project +++ b/sdk_common/tests/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>ide_common-tests</name> + <name>sdk_common-tests</name> <comment></comment> <projects> </projects> diff --git a/ide_common/tests/Android.mk b/sdk_common/tests/Android.mk index 9443dba..e7f8c8d 100644 --- a/ide_common/tests/Android.mk +++ b/sdk_common/tests/Android.mk @@ -19,9 +19,9 @@ include $(CLEAR_VARS) # Only compile source java files in this lib. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := ide_common-tests +LOCAL_MODULE := sdk_common-tests LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := common ide_common junit +LOCAL_JAVA_LIBRARIES := common sdk_common junit include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/CountryCodeQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/CountryCodeQualifierTest.java index eba8b8d..eba8b8d 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/CountryCodeQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/CountryCodeQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/DockModeQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/DockModeQualifierTest.java index 1653805..1653805 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/DockModeQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/DockModeQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java index 261f9a8..261f9a8 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/FolderConfigurationTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/KeyboardStateQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/KeyboardStateQualifierTest.java index cf52a38..cf52a38 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/KeyboardStateQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/KeyboardStateQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/LanguageQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/LanguageQualifierTest.java index 2dfd65f..2dfd65f 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/LanguageQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/LanguageQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/NavigationMethodQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/NavigationMethodQualifierTest.java index 4237dde..4237dde 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/NavigationMethodQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/NavigationMethodQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/NetworkCodeQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/NetworkCodeQualifierTest.java index 6896316..6896316 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/NetworkCodeQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/NetworkCodeQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/PixelDensityQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/PixelDensityQualifierTest.java index 4ab493a..4ab493a 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/PixelDensityQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/PixelDensityQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/RegionQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/RegionQualifierTest.java index fc0402c..fc0402c 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/RegionQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/RegionQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifierTest.java index e57424f..e57424f 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenDimensionQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifierTest.java index 3aac5f3..3aac5f3 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenOrientationQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java index b19f125..b19f125 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/TextInputMethodQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/TextInputMethodQualifierTest.java index bc2c890..bc2c890 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/TextInputMethodQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/TextInputMethodQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/TouchScreenQualifierTest.java b/sdk_common/tests/src/com/android/ide/common/resources/configuration/TouchScreenQualifierTest.java index 04f8a30..04f8a30 100644 --- a/ide_common/tests/src/com/android/ide/common/resources/configuration/TouchScreenQualifierTest.java +++ b/sdk_common/tests/src/com/android/ide/common/resources/configuration/TouchScreenQualifierTest.java diff --git a/ide_common/tests/src/com/android/ide/common/xml/AndroidManifestParserTest.java b/sdk_common/tests/src/com/android/ide/common/xml/AndroidManifestParserTest.java index 1bd6402..1bd6402 100644 --- a/ide_common/tests/src/com/android/ide/common/xml/AndroidManifestParserTest.java +++ b/sdk_common/tests/src/com/android/ide/common/xml/AndroidManifestParserTest.java diff --git a/ide_common/tests/src/com/android/ide/common/xml/SupportsScreensTest.java b/sdk_common/tests/src/com/android/ide/common/xml/SupportsScreensTest.java index aa88fc7..aa88fc7 100644 --- a/ide_common/tests/src/com/android/ide/common/xml/SupportsScreensTest.java +++ b/sdk_common/tests/src/com/android/ide/common/xml/SupportsScreensTest.java |