Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Android samples are renamed

Browse Source
pull/13383/head
Andrey Kamaev 14 years ago
parent 39dab5e0cf
commit 7c6fc6e18a
62 changed files with 28 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      android/scripts/package.sh
  2. 2
      modules/java/android/.project
  3. 6
      modules/java/android/AndroidManifest.xml
  4. 4
      samples/android/0-base/res/values/strings.xml
  5. 4
      samples/android/1-java/res/values/strings.xml
  6. 2
      samples/android/CMakeLists.txt
  7. 0
      samples/android/tutorial-0-androidcamera/.classpath
  8. 2
      samples/android/tutorial-0-androidcamera/.project
  9. 0
      samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
  10. 2
      samples/android/tutorial-0-androidcamera/AndroidManifest.xml
  11. 0
      samples/android/tutorial-0-androidcamera/default.properties
  12. 0
      samples/android/tutorial-0-androidcamera/res/drawable/icon.png
  13. 4
      samples/android/tutorial-0-androidcamera/res/values/strings.xml
  14. 2
      samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java
  15. 2
      samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java
  16. 2
      samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java
  17. 2
      samples/android/tutorial-1-addopencv/.classpath
  18. 6
      samples/android/tutorial-1-addopencv/.project
  19. 0
      samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
  20. 2
      samples/android/tutorial-1-addopencv/AndroidManifest.xml
  21. 0
      samples/android/tutorial-1-addopencv/default.properties
  22. 0
      samples/android/tutorial-1-addopencv/res/drawable/icon.png
  23. 4
      samples/android/tutorial-1-addopencv/res/values/strings.xml
  24. 2
      samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java
  25. 2
      samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java
  26. 2
      samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java
  27. 2
      samples/android/tutorial-2-opencvcamera/.classpath
  28. 0
      samples/android/tutorial-2-opencvcamera/.project
  29. 0
      samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
  30. 0
      samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
  31. 0
      samples/android/tutorial-2-opencvcamera/default.properties
  32. 0
      samples/android/tutorial-2-opencvcamera/res/drawable/icon.png
  33. 0
      samples/android/tutorial-2-opencvcamera/res/values/strings.xml
  34. 0
      samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java
  35. 0
      samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java
  36. 0
      samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java
  37. 0
      samples/android/tutorial-3-native/.classpath
  38. 0
      samples/android/tutorial-3-native/.project
  39. 0
      samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
  40. 0
      samples/android/tutorial-3-native/AndroidManifest.xml
  41. 0
      samples/android/tutorial-3-native/default.properties
  42. 0
      samples/android/tutorial-3-native/jni/Android.mk
  43. 0
      samples/android/tutorial-3-native/jni/Application.mk
  44. 0
      samples/android/tutorial-3-native/jni/jni_part.cpp
  45. 0
      samples/android/tutorial-3-native/res/drawable/icon.png
  46. 0
      samples/android/tutorial-3-native/res/values/strings.xml
  47. 0
      samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java
  48. 0
      samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java
  49. 0
      samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java
  50. 0
      samples/android/tutorial-4-mixed/.classpath
  51. 0
      samples/android/tutorial-4-mixed/.project
  52. 0
      samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
  53. 0
      samples/android/tutorial-4-mixed/AndroidManifest.xml
  54. 0
      samples/android/tutorial-4-mixed/default.properties
  55. 0
      samples/android/tutorial-4-mixed/jni/Android.mk
  56. 0
      samples/android/tutorial-4-mixed/jni/Application.mk
  57. 0
      samples/android/tutorial-4-mixed/jni/jni_part.cpp
  58. 0
      samples/android/tutorial-4-mixed/res/drawable/icon.png
  59. 0
      samples/android/tutorial-4-mixed/res/values/strings.xml
  60. 0
      samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
  61. 0
      samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java
  62. 0
      samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java

2
android/scripts/package.sh
Unescape View File

@ -79,7 +79,7 @@ do
fi
done
echo "OPENCV_MK_PATH:=../../opencv$CV_VERSION/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
echo "OPENCV_MK_PATH:=../../$OPENCV_NAME/share/OpenCV/OpenCV.mk" > includeOpenCV.mk
#clean samples

2
modules/java/android/.project
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>opencv2.3.1</name>
<name>OpenCV-2.3.1</name>
<comment></comment>
<projects>
</projects>

6
modules/java/android/AndroidManifest.xml
Unescape View File

@ -3,9 +3,9 @@
package="org.opencv"
android:versionCode="1"
android:versionName="1.0">
<application android:label="opencv2.3.1">
<activity android:name="opencv2.3.1"
android:label="opencv2.3.1">
<application android:label="OpenCV-2.3.1">
<activity android:name="OpenCV-2.3.1"
android:label="OpenCV-2.3.1">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

4
samples/android/0-base/res/values/strings.xml
Unescape View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Sample 0: base</string>
</resources>

4
samples/android/1-java/res/values/strings.xml
Unescape View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Sample 1: Java API</string>
</resources>

2
samples/android/CMakeLists.txt
Unescape View File

@ -40,7 +40,7 @@ if (BUILD_ANDROID_EXAMPLES)
file(RELATIVE_PATH OPENCV_REFERENCE_PATH "${sample_dir}" "${CMAKE_BINARY_DIR}")
if(NOT ("${sample}" STREQUAL "0-base" OR "${sample}" STREQUAL "2-native"))
if(NOT ("${sample}" MATCHES "tutorial-[03].*"))
SET(opencv_reference --library \"${OPENCV_REFERENCE_PATH}\")
else()
SET(opencv_reference)

0
samples/android/0-base/.classpath → samples/android/tutorial-0-androidcamera/.classpath
Unescape View File

2
samples/android/0-base/.project → samples/android/tutorial-0-androidcamera/.project
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Sample 0 base</name>
<name>Tutorial 1 Basic - 0. Android Camera</name>
<comment></comment>
<projects>
</projects>

0
samples/android/0-base/.settings/org.eclipse.jdt.core.prefs → samples/android/tutorial-0-androidcamera/.settings/org.eclipse.jdt.core.prefs
Unescape View File

2
samples/android/0-base/AndroidManifest.xml → samples/android/tutorial-0-androidcamera/AndroidManifest.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.s0"
package="org.opencv.samples.tutorial0"
android:versionCode="1"
android:versionName="1.0">

0
samples/android/0-base/default.properties → samples/android/tutorial-0-androidcamera/default.properties
Unescape View File

0
samples/android/0-base/res/drawable/icon.png → samples/android/tutorial-0-androidcamera/res/drawable/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

4
samples/android/tutorial-0-androidcamera/res/values/strings.xml
Unescape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Tutorial 1 Basic - 0. Android Camera</string>
</resources>

2
samples/android/0-base/src/org/opencv/samples/s0/Sample0Base.java → samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0Base.java
Unescape View File

@ -1,4 +1,4 @@
package org.opencv.samples.s0;
package org.opencv.samples.tutorial0;
import android.app.Activity;
import android.os.Bundle;

2
samples/android/0-base/src/org/opencv/samples/s0/Sample0View.java → samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/Sample0View.java
Unescape View File

@ -1,4 +1,4 @@
package org.opencv.samples.s0;
package org.opencv.samples.tutorial0;
import android.content.Context;
import android.graphics.Bitmap;

2
samples/android/1-java/src/org/opencv/samples/s1/SampleViewBase.java → samples/android/tutorial-0-androidcamera/src/org/opencv/samples/s0/SampleViewBase.java
Unescape View File

@ -1,4 +1,4 @@
package org.opencv.samples.s1;
package org.opencv.samples.tutorial0;
import java.util.List;

2
samples/android/3-nativecamera/.classpath → samples/android/tutorial-1-addopencv/.classpath
Unescape View File

@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="opencv2.3.1_src"/>
<classpathentry kind="src" path="OpenCV-2.3.1_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

6
samples/android/1-java/.project → samples/android/tutorial-1-addopencv/.project
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Sample 1 Java API</name>
<name>Tutorial 1 Basic - 1. Add OpenCV</name>
<comment></comment>
<projects>
</projects>
@ -32,9 +32,9 @@
</natures>
<linkedResources>
<link>
<name>opencv2.3.1_src</name>
<name>OpenCV-2.3.1_src</name>
<type>2</type>
<locationURI>_android_opencv2_3_1_d2471b5d/src</locationURI>
<locationURI>_android_OpenCV-2_3_1_d2471b5d/src</locationURI>
</link>
</linkedResources>
</projectDescription>

0
samples/android/1-java/.settings/org.eclipse.jdt.core.prefs → samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs
Unescape View File

2
samples/android/1-java/AndroidManifest.xml → samples/android/tutorial-1-addopencv/AndroidManifest.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.s1"
package="org.opencv.samples.tutorial1"
android:versionCode="1"
android:versionName="1.0">

0
samples/android/1-java/default.properties → samples/android/tutorial-1-addopencv/default.properties
Unescape View File

0
samples/android/1-java/res/drawable/icon.png → samples/android/tutorial-1-addopencv/res/drawable/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

4
samples/android/tutorial-1-addopencv/res/values/strings.xml
Unescape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Tutorial 1 Basic - 1. Add OpenCV</string>
</resources>

2
samples/android/1-java/src/org/opencv/samples/s1/Sample1Java.java → samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1Java.java
Unescape View File

@ -1,4 +1,4 @@
package org.opencv.samples.s1;
package org.opencv.samples.tutorial1;
import android.app.Activity;
import android.os.Bundle;

2
samples/android/1-java/src/org/opencv/samples/s1/Sample1View.java → samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/Sample1View.java
Unescape View File

@ -1,4 +1,4 @@
package org.opencv.samples.s1;
package org.opencv.samples.tutorial1;
import org.opencv.*;

2
samples/android/0-base/src/org/opencv/samples/s0/SampleViewBase.java → samples/android/tutorial-1-addopencv/src/org/opencv/samples/s1/SampleViewBase.java
Unescape View File

@ -1,4 +1,4 @@
package org.opencv.samples.s0;
package org.opencv.samples.tutorial1;
import java.util.List;

2
samples/android/4-mixed/.classpath → samples/android/tutorial-2-opencvcamera/.classpath
Unescape View File

@ -3,6 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="opencv2.3.1_src"/>
<classpathentry kind="src" path="OpenCV-2.3.1_src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

0
samples/android/3-nativecamera/.project → samples/android/tutorial-2-opencvcamera/.project
Unescape View File

0
samples/android/2-native/.settings/org.eclipse.jdt.core.prefs → samples/android/tutorial-2-opencvcamera/.settings/org.eclipse.jdt.core.prefs
Unescape View File

0
samples/android/3-nativecamera/AndroidManifest.xml → samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
Unescape View File

0
samples/android/3-nativecamera/default.properties → samples/android/tutorial-2-opencvcamera/default.properties
Unescape View File

0
samples/android/2-native/res/drawable/icon.png → samples/android/tutorial-2-opencvcamera/res/drawable/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
samples/android/3-nativecamera/res/values/strings.xml → samples/android/tutorial-2-opencvcamera/res/values/strings.xml
Unescape View File

0
samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3NativeCamera.java → samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java
Unescape View File

0
samples/android/3-nativecamera/src/org/opencv/samples/s3/Sample3View.java → samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java
Unescape View File

0
samples/android/3-nativecamera/src/org/opencv/samples/s3/SampleViewBase.java → samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java
Unescape View File

0
samples/android/2-native/.classpath → samples/android/tutorial-3-native/.classpath
Unescape View File

0
samples/android/2-native/.project → samples/android/tutorial-3-native/.project
Unescape View File

0
samples/android/3-nativecamera/.settings/org.eclipse.jdt.core.prefs → samples/android/tutorial-3-native/.settings/org.eclipse.jdt.core.prefs
Unescape View File

0
samples/android/2-native/AndroidManifest.xml → samples/android/tutorial-3-native/AndroidManifest.xml
Unescape View File

0
samples/android/2-native/default.properties → samples/android/tutorial-3-native/default.properties
Unescape View File

0
samples/android/2-native/jni/Android.mk → samples/android/tutorial-3-native/jni/Android.mk
Unescape View File

0
samples/android/2-native/jni/Application.mk → samples/android/tutorial-3-native/jni/Application.mk
Unescape View File

0
samples/android/2-native/jni/jni_part.cpp → samples/android/tutorial-3-native/jni/jni_part.cpp
Unescape View File

0
samples/android/3-nativecamera/res/drawable/icon.png → samples/android/tutorial-3-native/res/drawable/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
samples/android/2-native/res/values/strings.xml → samples/android/tutorial-3-native/res/values/strings.xml
Unescape View File

0
samples/android/2-native/src/org/opencv/samples/s2/Sample2Native.java → samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2Native.java
Unescape View File

0
samples/android/2-native/src/org/opencv/samples/s2/Sample2View.java → samples/android/tutorial-3-native/src/org/opencv/samples/s2/Sample2View.java
Unescape View File

0
samples/android/2-native/src/org/opencv/samples/s2/SampleViewBase.java → samples/android/tutorial-3-native/src/org/opencv/samples/s2/SampleViewBase.java
Unescape View File

0
samples/android/1-java/.classpath → samples/android/tutorial-4-mixed/.classpath
Unescape View File

0
samples/android/4-mixed/.project → samples/android/tutorial-4-mixed/.project
Unescape View File

0
samples/android/4-mixed/.settings/org.eclipse.jdt.core.prefs → samples/android/tutorial-4-mixed/.settings/org.eclipse.jdt.core.prefs
Unescape View File

0
samples/android/4-mixed/AndroidManifest.xml → samples/android/tutorial-4-mixed/AndroidManifest.xml
Unescape View File

0
samples/android/4-mixed/default.properties → samples/android/tutorial-4-mixed/default.properties
Unescape View File

0
samples/android/4-mixed/jni/Android.mk → samples/android/tutorial-4-mixed/jni/Android.mk
Unescape View File

0
samples/android/4-mixed/jni/Application.mk → samples/android/tutorial-4-mixed/jni/Application.mk
Unescape View File

0
samples/android/4-mixed/jni/jni_part.cpp → samples/android/tutorial-4-mixed/jni/jni_part.cpp
Unescape View File

0
samples/android/4-mixed/res/drawable/icon.png → samples/android/tutorial-4-mixed/res/drawable/icon.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

0
samples/android/4-mixed/res/values/strings.xml → samples/android/tutorial-4-mixed/res/values/strings.xml
Unescape View File

0
samples/android/4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java → samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4Mixed.java
Unescape View File

0
samples/android/4-mixed/src/org/opencv/samples/s4/Sample4View.java → samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/Sample4View.java
Unescape View File

0
samples/android/4-mixed/src/org/opencv/samples/s4/SampleViewBase.java → samples/android/tutorial-4-mixed/src/org/opencv/samples/s4/SampleViewBase.java
Unescape View File

Write Preview
Loading…
Cancel
Save