diff options
24 files changed, 310 insertions, 20 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java index 1d36835..d542df4 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java @@ -136,7 +136,7 @@ public class ProjectProperties { // 1-------10--------20--------30--------40--------50--------60--------70--------80 "# This file is automatically generated by Android Tools.\n" + "# Do not modify this file -- YOUR CHANGES WILL BE ERASED!\n" + - "# \n" + + "#\n" + "# This file must *NOT* be checked in Version Control Systems,\n" + "# as it contains information specific to your local configuration.\n" + "\n"; @@ -145,9 +145,9 @@ public class ProjectProperties { // 1-------10--------20--------30--------40--------50--------60--------70--------80 "# This file is automatically generated by Android Tools.\n" + "# Do not modify this file -- YOUR CHANGES WILL BE ERASED!\n" + - "# \n" + + "#\n" + "# This file must be checked in Version Control Systems.\n" + - "# \n" + + "#\n" + "# To customize properties used by the Ant build system use,\n" + "# \"build.properties\", and override values to adapt the script to your\n" + "# project structure.\n" + @@ -156,7 +156,7 @@ public class ProjectProperties { private final static String BUILD_HEADER = // 1-------10--------20--------30--------40--------50--------60--------70--------80 "# This file is used to override default values used by the Ant build system.\n" + - "# \n" + + "#\n" + "# This file must be checked in Version Control Systems, as it is\n" + "# integral to the build system of your project.\n" + "\n" + @@ -176,7 +176,7 @@ public class ProjectProperties { private final static String EXPORT_HEADER = // 1-------10--------20--------30--------40--------50--------60--------70--------80 "# Export properties\n" + - "# \n" + + "#\n" + "# This file must be checked in Version Control Systems.\n" + "\n" + "# The main content for this file is:\n" + diff --git a/templates/AndroidManifest.template b/templates/AndroidManifest.template index f14f147..4d1e053 100644 --- a/templates/AndroidManifest.template +++ b/templates/AndroidManifest.template @@ -12,4 +12,4 @@ </intent-filter> </activity> </application> -</manifest> +</manifest> diff --git a/templates/build.template b/templates/build.template index 7ab06c0..f57adf9 100644 --- a/templates/build.template +++ b/templates/build.template @@ -76,7 +76,7 @@ - copy/paste the content of the rules files (minus the top node) into this file, *after* the <setup> task - disable the import of the rules by changing the setup task - below to <setup import="false" />. + below to <setup import="false" />. - customize to your needs. --> <setup /> diff --git a/templates/layout.template b/templates/layout.template index f5e367c..7d62fbb 100644 --- a/templates/layout.template +++ b/templates/layout.template @@ -4,9 +4,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > -<TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" +<TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="Hello World, ACTIVITY_ENTRY_NAME" /> </LinearLayout> diff --git a/testapps/basicLib/AndroidManifest.xml b/testapps/basicLib/AndroidManifest.xml new file mode 100644 index 0000000..96c8aaa --- /dev/null +++ b/testapps/basicLib/AndroidManifest.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.basiclib" + android:versionCode="1" + android:versionName="1.0"> + <application android:label="@string/app_name" android:icon="@drawable/icon"> + <activity android:name="Main" + android:label="@string/app_name"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + <uses-sdk android:minSdkVersion="AOSP" /> +</manifest> diff --git a/testapps/basicLib/build.properties b/testapps/basicLib/build.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/basicLib/build.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/basicLib/build.xml b/testapps/basicLib/build.xml new file mode 100644 index 0000000..ea34e33 --- /dev/null +++ b/testapps/basicLib/build.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="basicLib" default="help"> + +<!-- The local.properties file is created and updated by the 'android' + tool. + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <property file="local.properties" /> + + <!-- The build.properties file can be created by you and is never touched + by the 'android' tool. This is the place to change some of the + default property values used by the Ant rules. + Here are some properties you may want to change/update: + + source.dir + The name of the source directory. Default is 'src'. + out.dir + The name of the output directory. Default is 'bin'. + + Properties related to the SDK location or the project target should + be updated using the 'android' tool with the 'update' action. + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. + + --> + <property file="build.properties" /> + + <!-- The default.properties file is created and updated by the 'android' + tool, as well as ADT. + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. --> + <property file="default.properties" /> + + <!-- Custom Android task to deal with the project target, and import the + proper rules. + This requires ant 1.6.0 or above. --> + <path id="android.antlibs"> + <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> + <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> + <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> + </path> + + <taskdef name="setup" + classname="com.android.ant.SetupTask" + classpathref="android.antlibs" /> + +<!-- extension targets. Uncomment the ones where you want to do custom work + in between standard targets --> +<!-- + <target name="-pre-build"> + </target> + <target name="-pre-compile"> + </target> + + [This is typically used for code obfuscation. + Compiled code location: ${out.classes.absolute.dir} + If this is not done in place, override ${out.dex.input.absolute.dir}] + <target name="-post-compile"> + </target> +--> + + + <!-- Execute the Android Setup task that will setup some properties + specific to the target, and import the build rules files. + + The rules file is imported from + <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml + + To customize existing targets, there are two options: + - Customize only one target: + - copy/paste the target into this file, *before* the + <setup> task. + - customize it to your needs. + - Customize the whole script. + - copy/paste the content of the rules files (minus the top node) + into this file, *after* the <setup> task + - disable the import of the rules by changing the setup task + below to <setup import="false" />. + - customize to your needs. + --> + <setup /> + +</project> diff --git a/testapps/basicLib/default.properties b/testapps/basicLib/default.properties new file mode 100644 index 0000000..beef685 --- /dev/null +++ b/testapps/basicLib/default.properties @@ -0,0 +1,12 @@ +# 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 use, +# "build.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-AOSP +android.library=true diff --git a/testapps/basicLib/res/drawable-hdpi/icon.png b/testapps/basicLib/res/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 0000000..8074c4c --- /dev/null +++ b/testapps/basicLib/res/drawable-hdpi/icon.png diff --git a/testapps/basicLib/res/drawable-ldpi/icon.png b/testapps/basicLib/res/drawable-ldpi/icon.png Binary files differnew file mode 100644 index 0000000..1095584 --- /dev/null +++ b/testapps/basicLib/res/drawable-ldpi/icon.png diff --git a/testapps/basicLib/res/drawable-mdpi/icon.png b/testapps/basicLib/res/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/testapps/basicLib/res/drawable-mdpi/icon.png diff --git a/testapps/basicLib/res/layout/main.xml b/testapps/basicLib/res/layout/main.xml new file mode 100644 index 0000000..b79cddb --- /dev/null +++ b/testapps/basicLib/res/layout/main.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > +<TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Hello World, Main" + /> +</LinearLayout> + diff --git a/testapps/basicLib/res/values/strings.xml b/testapps/basicLib/res/values/strings.xml new file mode 100644 index 0000000..549e4ea --- /dev/null +++ b/testapps/basicLib/res/values/strings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">Main</string> +</resources> diff --git a/testapps/basicLib/src/com/android/tests/basiclib/Main.java b/testapps/basicLib/src/com/android/tests/basiclib/Main.java new file mode 100644 index 0000000..c834883 --- /dev/null +++ b/testapps/basicLib/src/com/android/tests/basiclib/Main.java @@ -0,0 +1,15 @@ +package com.android.tests.basiclib; + +import android.app.Activity; +import android.os.Bundle; + +public class Main extends Activity +{ + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + } +} diff --git a/testapps/basicProject/.project b/testapps/basicProject/.project index 2bf35ce..ef11c50 100644 --- a/testapps/basicProject/.project +++ b/testapps/basicProject/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>BasicProject</name> + <name>basicProject</name> <comment></comment> <projects> </projects> diff --git a/testapps/basicProject/AndroidManifest.xml b/testapps/basicProject/AndroidManifest.xml index 978c71e..aafc833 100644 --- a/testapps/basicProject/AndroidManifest.xml +++ b/testapps/basicProject/AndroidManifest.xml @@ -13,4 +13,4 @@ </activity> </application> <uses-sdk android:minSdkVersion="AOSP" /> -</manifest> +</manifest> diff --git a/testapps/basicProject/build.properties b/testapps/basicProject/build.properties index edc7f23..ee52d86 100644 --- a/testapps/basicProject/build.properties +++ b/testapps/basicProject/build.properties @@ -1,5 +1,5 @@ # This file is used to override default values used by the Ant build system. -# +# # This file must be checked in Version Control Systems, as it is # integral to the build system of your project. diff --git a/testapps/basicProject/build.xml b/testapps/basicProject/build.xml index 9ac802c..9983df5 100644 --- a/testapps/basicProject/build.xml +++ b/testapps/basicProject/build.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="BasicProject" default="help"> +<project name="basicProject" default="help"> <!-- The local.properties file is created and updated by the 'android' tool. @@ -76,7 +76,7 @@ - copy/paste the content of the rules files (minus the top node) into this file, *after* the <setup> task - disable the import of the rules by changing the setup task - below to <setup import="false" />. + below to <setup import="false" />. - customize to your needs. --> <setup /> diff --git a/testapps/basicProject/default.properties b/testapps/basicProject/default.properties index 640d5d4..8ee25b8 100644 --- a/testapps/basicProject/default.properties +++ b/testapps/basicProject/default.properties @@ -1,8 +1,8 @@ # 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 use, # "build.properties", and override values to adapt the script to your # project structure. diff --git a/testapps/basicProject/res/layout/main.xml b/testapps/basicProject/res/layout/main.xml index 829994c..b79cddb 100644 --- a/testapps/basicProject/res/layout/main.xml +++ b/testapps/basicProject/res/layout/main.xml @@ -4,9 +4,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > -<TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" +<TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" android:text="Hello World, Main" /> </LinearLayout> diff --git a/testapps/basicProjectWithLib/AndroidManifest.xml b/testapps/basicProjectWithLib/AndroidManifest.xml new file mode 100644 index 0000000..fe394f2 --- /dev/null +++ b/testapps/basicProjectWithLib/AndroidManifest.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.tests.basicProjectWithLib" + android:versionCode="1" + android:versionName="1.0"> + <application android:label="@string/app_name" android:icon="@drawable/icon"> + <activity android:name="com.android.tests.basiclib.Main" + android:label="@string/app_name"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + <uses-sdk android:minSdkVersion="AOSP" /> +</manifest> diff --git a/testapps/basicProjectWithLib/build.properties b/testapps/basicProjectWithLib/build.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/basicProjectWithLib/build.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/basicProjectWithLib/build.xml b/testapps/basicProjectWithLib/build.xml new file mode 100644 index 0000000..a83eed4 --- /dev/null +++ b/testapps/basicProjectWithLib/build.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="basicProjectWithLib" default="help"> + +<!-- The local.properties file is created and updated by the 'android' + tool. + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <property file="local.properties" /> + + <!-- The build.properties file can be created by you and is never touched + by the 'android' tool. This is the place to change some of the + default property values used by the Ant rules. + Here are some properties you may want to change/update: + + source.dir + The name of the source directory. Default is 'src'. + out.dir + The name of the output directory. Default is 'bin'. + + Properties related to the SDK location or the project target should + be updated using the 'android' tool with the 'update' action. + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. + + --> + <property file="build.properties" /> + + <!-- The default.properties file is created and updated by the 'android' + tool, as well as ADT. + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. --> + <property file="default.properties" /> + + <!-- Custom Android task to deal with the project target, and import the + proper rules. + This requires ant 1.6.0 or above. --> + <path id="android.antlibs"> + <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> + <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> + <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> + </path> + + <taskdef name="setup" + classname="com.android.ant.SetupTask" + classpathref="android.antlibs" /> + +<!-- extension targets. Uncomment the ones where you want to do custom work + in between standard targets --> +<!-- + <target name="-pre-build"> + </target> + <target name="-pre-compile"> + </target> + + [This is typically used for code obfuscation. + Compiled code location: ${out.classes.absolute.dir} + If this is not done in place, override ${out.dex.input.absolute.dir}] + <target name="-post-compile"> + </target> +--> + + + <!-- Execute the Android Setup task that will setup some properties + specific to the target, and import the build rules files. + + The rules file is imported from + <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml + + To customize existing targets, there are two options: + - Customize only one target: + - copy/paste the target into this file, *before* the + <setup> task. + - customize it to your needs. + - Customize the whole script. + - copy/paste the content of the rules files (minus the top node) + into this file, *after* the <setup> task + - disable the import of the rules by changing the setup task + below to <setup import="false" />. + - customize to your needs. + --> + <setup /> + +</project> diff --git a/testapps/basicProjectWithLib/default.properties b/testapps/basicProjectWithLib/default.properties new file mode 100644 index 0000000..eb80ff8 --- /dev/null +++ b/testapps/basicProjectWithLib/default.properties @@ -0,0 +1,12 @@ +# 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 use, +# "build.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-AOSP +android.library.reference.1=../basicLib
\ No newline at end of file |
