aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/basicProjectWithJava
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-02-29 15:54:36 -0800
committerXavier Ducrohet <xav@android.com>2012-02-29 16:00:40 -0800
commit6c4f5c561d662456f55830a554c51c3d9670d094 (patch)
treed8a1fdc401ad02a8ae8099ea134272afa3ce1e8e /testapps/basicProjectWithJava
parentdd3f3c4fa0dc0bd5033f891ab005925343c146b7 (diff)
downloadsdk-6c4f5c561d662456f55830a554c51c3d9670d094.zip
sdk-6c4f5c561d662456f55830a554c51c3d9670d094.tar.gz
sdk-6c4f5c561d662456f55830a554c51c3d9670d094.tar.bz2
Move Android project with Java project dep test to its own folder.
Also make it more complex: - java project references a jar file. - 2 libs depend on the java project - app project only reference the libs, not the java project (it still does but indirectly). Change-Id: I8fc53e0f868ce014ea99486e7b1fa6fe0f197daa
Diffstat (limited to 'testapps/basicProjectWithJava')
-rw-r--r--testapps/basicProjectWithJava/.classpath9
-rw-r--r--testapps/basicProjectWithJava/.project33
-rw-r--r--testapps/basicProjectWithJava/AndroidManifest.xml16
-rw-r--r--testapps/basicProjectWithJava/default.properties11
-rw-r--r--testapps/basicProjectWithJava/res/drawable-hdpi/icon.pngbin4147 -> 0 bytes
-rw-r--r--testapps/basicProjectWithJava/res/drawable-ldpi/icon.pngbin1723 -> 0 bytes
-rw-r--r--testapps/basicProjectWithJava/res/drawable-mdpi/icon.pngbin2574 -> 0 bytes
-rw-r--r--testapps/basicProjectWithJava/res/layout/main.xml18
-rw-r--r--testapps/basicProjectWithJava/res/values/strings.xml4
-rw-r--r--testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java22
-rw-r--r--testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java27
11 files changed, 0 insertions, 140 deletions
diff --git a/testapps/basicProjectWithJava/.classpath b/testapps/basicProjectWithJava/.classpath
deleted file mode 100644
index 61fad04..0000000
--- a/testapps/basicProjectWithJava/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="gen"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry combineaccessrules="false" kind="src" path="/basicJavaProject"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/testapps/basicProjectWithJava/.project b/testapps/basicProjectWithJava/.project
deleted file mode 100644
index 5ff4505..0000000
--- a/testapps/basicProjectWithJava/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>basicProjectWithJava</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/testapps/basicProjectWithJava/AndroidManifest.xml b/testapps/basicProjectWithJava/AndroidManifest.xml
deleted file mode 100644
index bf7a084..0000000
--- a/testapps/basicProjectWithJava/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- android:versionCode="1"
- android:versionName="1.0" package="com.android.tests.basicProjectWithJava">
- <uses-sdk android:minSdkVersion="AOSP" />
-
- <application android:icon="@drawable/icon" android:label="@string/app_name">
- <activity android:label="@string/app_name" android:name="Main">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- </application>
-</manifest> \ No newline at end of file
diff --git a/testapps/basicProjectWithJava/default.properties b/testapps/basicProjectWithJava/default.properties
deleted file mode 100644
index 8ee25b8..0000000
--- a/testapps/basicProjectWithJava/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
diff --git a/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png b/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c..0000000
--- a/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png b/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584..0000000
--- a/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png b/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69f..0000000
--- a/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/testapps/basicProjectWithJava/res/layout/main.xml b/testapps/basicProjectWithJava/res/layout/main.xml
deleted file mode 100644
index 670dd32..0000000
--- a/testapps/basicProjectWithJava/res/layout/main.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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="basicProjectWithJava"
- android:id="@+id/text"
- />
-<com.android.tests.basicProjectWithJava.MyTextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:id="@+id/text"
- />
-</LinearLayout>
diff --git a/testapps/basicProjectWithJava/res/values/strings.xml b/testapps/basicProjectWithJava/res/values/strings.xml
deleted file mode 100644
index 96d8724..0000000
--- a/testapps/basicProjectWithJava/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <string name="app_name">basicProjectWithJava</string>
-</resources>
diff --git a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java b/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java
deleted file mode 100644
index eb6be25..0000000
--- a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.android.tests.basicProjectWithJava;
-
-import com.android.tests.basicJavaProject.Foo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-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);
-
- Foo foo = new Foo();
-
- TextView tv = (TextView) findViewById(R.id.text);
- tv.setText("basicProjectWithJava\nvalue from java project:" + foo.getRandomFoo());
- }
-
-} \ No newline at end of file
diff --git a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java b/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java
deleted file mode 100644
index ae35dca..0000000
--- a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.android.tests.basicProjectWithJava;
-
-import com.android.tests.basicJavaProject.Foo;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-public class MyTextView extends TextView {
-
- public MyTextView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- Foo f = new Foo();
- setText("Foo: " + f.getRandomFoo());
- }
-
- public MyTextView(Context context, AttributeSet attrs) {
- super(context, attrs);
- Foo f = new Foo();
- setText("Foo: " + f.getRandomFoo());
- }
-
- public MyTextView(Context context) {
- super(context);
- }
-}