Fixed Android tests resources and settings

diff --git a/modules/java/android_test/.project b/modules/java/android_test/.project
index ef55873..e47735c 100644 (file)
--- a/modules/java/android_test/.project
+++ b/modules/java/android_test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>OpenCV_Test</name>
+       <name>OpenCV_JavaAPI_Tests</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs b/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..d995784
--- /dev/null
+++ b/modules/java/android_test/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Jun 29 04:36:40 MSD 2011\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5\r
+org.eclipse.jdt.core.compiler.compliance=1.5\r
+org.eclipse.jdt.core.compiler.source=1.5\r

diff --git a/modules/java/android_test/AndroidManifest.xml b/modules/java/android_test/AndroidManifest.xml
index aae85eb..a88053f 100644 (file)
--- a/modules/java/android_test/AndroidManifest.xml
+++ b/modules/java/android_test/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.opencv_test"
+      package="org.opencv.test"
       android:versionCode="1"
       android:versionName="1.0">
+      
     <uses-sdk android:minSdkVersion="8" />
-    <instrumentation android:targetPackage="org.opencv_test" android:name="android.test.InstrumentationTestRunner" />
+    <instrumentation android:targetPackage="org.opencv.test" android:name="android.test.InstrumentationTestRunner" />
     <application android:icon="@drawable/icon" android:label="@string/app_name">
-
-    <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner" />
     </application>
 </manifest>
\ No newline at end of file

diff --git a/modules/java/android_test/res/drawable-hdpi/icon.png b/modules/java/android_test/res/drawable-hdpi/icon.png
deleted file mode 100644 (file)
index 8074c4c..0000000
Binary files a/modules/java/android_test/res/drawable-hdpi/icon.png and /dev/null differ

diff --git a/modules/java/android_test/res/drawable-ldpi/icon.png b/modules/java/android_test/res/drawable-ldpi/icon.png
deleted file mode 100644 (file)
index 1095584..0000000
Binary files a/modules/java/android_test/res/drawable-ldpi/icon.png and /dev/null differ

diff --git a/modules/java/android_test/res/drawable-mdpi/icon.png b/modules/java/android_test/res/drawable-mdpi/icon.png
deleted file mode 100644 (file)
index a07c69f..0000000
Binary files a/modules/java/android_test/res/drawable-mdpi/icon.png and /dev/null differ

diff --git a/modules/java/android_test/res/drawable/icon.png b/modules/java/android_test/res/drawable/icon.png
new file mode 100644 (file)
index 0000000..4e828ba
Binary files /dev/null and b/modules/java/android_test/res/drawable/icon.png differ

diff --git a/modules/java/android_test/res/values/strings.xml b/modules/java/android_test/res/values/strings.xml
index f6f4876..634387d 100644 (file)
--- a/modules/java/android_test/res/values/strings.xml
+++ b/modules/java/android_test/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">Hello World!</string>
-    <string name="app_name">OpenCV_Test</string>
+    <string name="app_name">OpenCV_JavaAPI_Tests</string>
 </resources>