diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index f3d76c6c27..6478ce3521 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -301,7 +301,7 @@ repositories { dependencies { compile project(path: ":OsmAnd-java", configuration: "android") - compile project(":design") + compile project(":eclipse-compile:design") compile fileTree( dir: "libs", include: ["*.jar"], diff --git a/OsmAnd/project.properties b/OsmAnd/project.properties index 734c18df89..146000a0b5 100644 --- a/OsmAnd/project.properties +++ b/OsmAnd/project.properties @@ -13,4 +13,4 @@ split.density=false target=android-21 dex.force.jumbo=true android.library.reference.1=../eclipse-compile/appcompat -android.library.reference.2=../design +android.library.reference.2=../eclipse-compile/design diff --git a/design/.gitignore b/design/.gitignore deleted file mode 100644 index 796b96d1c4..0000000000 --- a/design/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/eclipse-compile/design/.classpath b/eclipse-compile/design/.classpath new file mode 100644 index 0000000000..bb77a7f28f --- /dev/null +++ b/eclipse-compile/design/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/eclipse-compile/design/.gitignore b/eclipse-compile/design/.gitignore new file mode 100644 index 0000000000..455a9fb758 --- /dev/null +++ b/eclipse-compile/design/.gitignore @@ -0,0 +1,3 @@ +/build +/R +/bin diff --git a/eclipse-compile/design/.project b/eclipse-compile/design/.project new file mode 100644 index 0000000000..64517dc48c --- /dev/null +++ b/eclipse-compile/design/.project @@ -0,0 +1,33 @@ + + + android-support-design + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/eclipse-compile/design/AndroidManifest.xml b/eclipse-compile/design/AndroidManifest.xml new file mode 120000 index 0000000000..ca5aa004cc --- /dev/null +++ b/eclipse-compile/design/AndroidManifest.xml @@ -0,0 +1 @@ +src/main/AndroidManifest.xml \ No newline at end of file diff --git a/design/src/main/AndroidManifest.xml b/eclipse-compile/design/bin/AndroidManifest.xml similarity index 100% rename from design/src/main/AndroidManifest.xml rename to eclipse-compile/design/bin/AndroidManifest.xml diff --git a/eclipse-compile/design/bin/jarlist.cache b/eclipse-compile/design/bin/jarlist.cache new file mode 100644 index 0000000000..0565465f22 --- /dev/null +++ b/eclipse-compile/design/bin/jarlist.cache @@ -0,0 +1,3 @@ +# cache for current jar dependency. DO NOT EDIT. +# format is +# Encoding is UTF-8 diff --git a/design/build.gradle b/eclipse-compile/design/build.gradle similarity index 100% rename from design/build.gradle rename to eclipse-compile/design/build.gradle diff --git a/eclipse-compile/design/gen/.gitignore b/eclipse-compile/design/gen/.gitignore new file mode 100644 index 0000000000..3015774bfa --- /dev/null +++ b/eclipse-compile/design/gen/.gitignore @@ -0,0 +1 @@ +/android/ diff --git a/eclipse-compile/design/gen/android/support/design/BuildConfig.java b/eclipse-compile/design/gen/android/support/design/BuildConfig.java new file mode 100644 index 0000000000..454f6da7a2 --- /dev/null +++ b/eclipse-compile/design/gen/android/support/design/BuildConfig.java @@ -0,0 +1,6 @@ +/** Automatically generated file. DO NOT MODIFY */ +package android.support.design; + +public final class BuildConfig { + public final static boolean DEBUG = true; +} \ No newline at end of file diff --git a/design/libs/android-support-design.jar b/eclipse-compile/design/libs/android-support-design.jar similarity index 100% rename from design/libs/android-support-design.jar rename to eclipse-compile/design/libs/android-support-design.jar diff --git a/eclipse-compile/design/lint.xml b/eclipse-compile/design/lint.xml new file mode 100644 index 0000000000..ee0eead5bb --- /dev/null +++ b/eclipse-compile/design/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/design/proguard-rules.pro b/eclipse-compile/design/proguard-rules.pro similarity index 100% rename from design/proguard-rules.pro rename to eclipse-compile/design/proguard-rules.pro diff --git a/eclipse-compile/design/project.properties b/eclipse-compile/design/project.properties new file mode 100644 index 0000000000..17e2d080fd --- /dev/null +++ b/eclipse-compile/design/project.properties @@ -0,0 +1,16 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-21 +android.library=true +android.library.reference.1=../appcompat diff --git a/eclipse-compile/design/res b/eclipse-compile/design/res new file mode 120000 index 0000000000..607712c41d --- /dev/null +++ b/eclipse-compile/design/res @@ -0,0 +1 @@ +src/main/res/ \ No newline at end of file diff --git a/design/src/androidTest/java/android/support/design/ApplicationTest.java b/eclipse-compile/design/src/androidTest/java/android/support/design/ApplicationTest.java similarity index 100% rename from design/src/androidTest/java/android/support/design/ApplicationTest.java rename to eclipse-compile/design/src/androidTest/java/android/support/design/ApplicationTest.java diff --git a/eclipse-compile/design/src/main/AndroidManifest.xml b/eclipse-compile/design/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..012c7bf894 --- /dev/null +++ b/eclipse-compile/design/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + diff --git a/design/src/main/res/anim/fab_in.xml b/eclipse-compile/design/src/main/res/anim/fab_in.xml similarity index 100% rename from design/src/main/res/anim/fab_in.xml rename to eclipse-compile/design/src/main/res/anim/fab_in.xml diff --git a/design/src/main/res/anim/fab_out.xml b/eclipse-compile/design/src/main/res/anim/fab_out.xml similarity index 100% rename from design/src/main/res/anim/fab_out.xml rename to eclipse-compile/design/src/main/res/anim/fab_out.xml diff --git a/design/src/main/res/anim/snackbar_in.xml b/eclipse-compile/design/src/main/res/anim/snackbar_in.xml similarity index 100% rename from design/src/main/res/anim/snackbar_in.xml rename to eclipse-compile/design/src/main/res/anim/snackbar_in.xml diff --git a/design/src/main/res/anim/snackbar_out.xml b/eclipse-compile/design/src/main/res/anim/snackbar_out.xml similarity index 100% rename from design/src/main/res/anim/snackbar_out.xml rename to eclipse-compile/design/src/main/res/anim/snackbar_out.xml diff --git a/design/src/main/res/drawable/fab_background.xml b/eclipse-compile/design/src/main/res/drawable/fab_background.xml similarity index 100% rename from design/src/main/res/drawable/fab_background.xml rename to eclipse-compile/design/src/main/res/drawable/fab_background.xml diff --git a/design/src/main/res/drawable/snackbar_background.xml b/eclipse-compile/design/src/main/res/drawable/snackbar_background.xml similarity index 100% rename from design/src/main/res/drawable/snackbar_background.xml rename to eclipse-compile/design/src/main/res/drawable/snackbar_background.xml diff --git a/design/src/main/res/layout-sw600dp/layout_snackbar.xml b/eclipse-compile/design/src/main/res/layout-sw600dp/layout_snackbar.xml similarity index 100% rename from design/src/main/res/layout-sw600dp/layout_snackbar.xml rename to eclipse-compile/design/src/main/res/layout-sw600dp/layout_snackbar.xml diff --git a/design/src/main/res/layout/design_navigation_item.xml b/eclipse-compile/design/src/main/res/layout/design_navigation_item.xml similarity index 100% rename from design/src/main/res/layout/design_navigation_item.xml rename to eclipse-compile/design/src/main/res/layout/design_navigation_item.xml diff --git a/design/src/main/res/layout/design_navigation_item_header.xml b/eclipse-compile/design/src/main/res/layout/design_navigation_item_header.xml similarity index 100% rename from design/src/main/res/layout/design_navigation_item_header.xml rename to eclipse-compile/design/src/main/res/layout/design_navigation_item_header.xml diff --git a/design/src/main/res/layout/design_navigation_item_separator.xml b/eclipse-compile/design/src/main/res/layout/design_navigation_item_separator.xml similarity index 100% rename from design/src/main/res/layout/design_navigation_item_separator.xml rename to eclipse-compile/design/src/main/res/layout/design_navigation_item_separator.xml diff --git a/design/src/main/res/layout/design_navigation_item_subheader.xml b/eclipse-compile/design/src/main/res/layout/design_navigation_item_subheader.xml similarity index 100% rename from design/src/main/res/layout/design_navigation_item_subheader.xml rename to eclipse-compile/design/src/main/res/layout/design_navigation_item_subheader.xml diff --git a/design/src/main/res/layout/design_navigation_menu.xml b/eclipse-compile/design/src/main/res/layout/design_navigation_menu.xml similarity index 100% rename from design/src/main/res/layout/design_navigation_menu.xml rename to eclipse-compile/design/src/main/res/layout/design_navigation_menu.xml diff --git a/design/src/main/res/layout/layout_snackbar.xml b/eclipse-compile/design/src/main/res/layout/layout_snackbar.xml similarity index 100% rename from design/src/main/res/layout/layout_snackbar.xml rename to eclipse-compile/design/src/main/res/layout/layout_snackbar.xml diff --git a/design/src/main/res/layout/layout_snackbar_include.xml b/eclipse-compile/design/src/main/res/layout/layout_snackbar_include.xml similarity index 100% rename from design/src/main/res/layout/layout_snackbar_include.xml rename to eclipse-compile/design/src/main/res/layout/layout_snackbar_include.xml diff --git a/design/src/main/res/layout/layout_tab_icon.xml b/eclipse-compile/design/src/main/res/layout/layout_tab_icon.xml similarity index 100% rename from design/src/main/res/layout/layout_tab_icon.xml rename to eclipse-compile/design/src/main/res/layout/layout_tab_icon.xml diff --git a/design/src/main/res/layout/layout_tab_text.xml b/eclipse-compile/design/src/main/res/layout/layout_tab_text.xml similarity index 100% rename from design/src/main/res/layout/layout_tab_text.xml rename to eclipse-compile/design/src/main/res/layout/layout_tab_text.xml diff --git a/design/src/main/res/values-land/styles.xml b/eclipse-compile/design/src/main/res/values-land/styles.xml similarity index 100% rename from design/src/main/res/values-land/styles.xml rename to eclipse-compile/design/src/main/res/values-land/styles.xml diff --git a/design/src/main/res/values-sw600dp/config.xml b/eclipse-compile/design/src/main/res/values-sw600dp/config.xml similarity index 100% rename from design/src/main/res/values-sw600dp/config.xml rename to eclipse-compile/design/src/main/res/values-sw600dp/config.xml diff --git a/design/src/main/res/values-sw600dp/dimens.xml b/eclipse-compile/design/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from design/src/main/res/values-sw600dp/dimens.xml rename to eclipse-compile/design/src/main/res/values-sw600dp/dimens.xml diff --git a/design/src/main/res/values-sw600dp/styles.xml b/eclipse-compile/design/src/main/res/values-sw600dp/styles.xml similarity index 100% rename from design/src/main/res/values-sw600dp/styles.xml rename to eclipse-compile/design/src/main/res/values-sw600dp/styles.xml diff --git a/design/src/main/res/values-v21/dimens.xml b/eclipse-compile/design/src/main/res/values-v21/dimens.xml similarity index 100% rename from design/src/main/res/values-v21/dimens.xml rename to eclipse-compile/design/src/main/res/values-v21/dimens.xml diff --git a/design/src/main/res/values/attrs.xml b/eclipse-compile/design/src/main/res/values/attrs.xml similarity index 100% rename from design/src/main/res/values/attrs.xml rename to eclipse-compile/design/src/main/res/values/attrs.xml diff --git a/design/src/main/res/values/colors.xml b/eclipse-compile/design/src/main/res/values/colors.xml similarity index 100% rename from design/src/main/res/values/colors.xml rename to eclipse-compile/design/src/main/res/values/colors.xml diff --git a/design/src/main/res/values/config.xml b/eclipse-compile/design/src/main/res/values/config.xml similarity index 100% rename from design/src/main/res/values/config.xml rename to eclipse-compile/design/src/main/res/values/config.xml diff --git a/design/src/main/res/values/dimens.xml b/eclipse-compile/design/src/main/res/values/dimens.xml similarity index 100% rename from design/src/main/res/values/dimens.xml rename to eclipse-compile/design/src/main/res/values/dimens.xml diff --git a/design/src/main/res/values/ids.xml b/eclipse-compile/design/src/main/res/values/ids.xml similarity index 100% rename from design/src/main/res/values/ids.xml rename to eclipse-compile/design/src/main/res/values/ids.xml diff --git a/design/src/main/res/values/strings.xml b/eclipse-compile/design/src/main/res/values/strings.xml similarity index 100% rename from design/src/main/res/values/strings.xml rename to eclipse-compile/design/src/main/res/values/strings.xml diff --git a/design/src/main/res/values/styles.xml b/eclipse-compile/design/src/main/res/values/styles.xml similarity index 100% rename from design/src/main/res/values/styles.xml rename to eclipse-compile/design/src/main/res/values/styles.xml