diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index 4443cebe14..a0794cb972 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory(color-blob-detection) add_subdirectory(tutorial-1-camerapreview) add_subdirectory(tutorial-2-mixedprocessing) -add_subdirectory(tutorial-5-cameracontrol) +add_subdirectory(tutorial-3-cameracontrol) #hello-android sample if(HAVE_opencv_highgui) diff --git a/samples/android/tutorial-5-cameracontrol/.classpath b/samples/android/tutorial-3-cameracontrol/.classpath similarity index 100% rename from samples/android/tutorial-5-cameracontrol/.classpath rename to samples/android/tutorial-3-cameracontrol/.classpath diff --git a/samples/android/tutorial-5-cameracontrol/.project b/samples/android/tutorial-3-cameracontrol/.project similarity index 100% rename from samples/android/tutorial-5-cameracontrol/.project rename to samples/android/tutorial-3-cameracontrol/.project diff --git a/samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-3-cameracontrol/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-5-cameracontrol/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-3-cameracontrol/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-5-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml similarity index 93% rename from samples/android/tutorial-5-cameracontrol/AndroidManifest.xml rename to samples/android/tutorial-3-cameracontrol/AndroidManifest.xml index 053033d6c0..fe7335449b 100644 --- a/samples/android/tutorial-5-cameracontrol/AndroidManifest.xml +++ b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-5-cameracontrol/CMakeLists.txt b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt similarity index 82% rename from samples/android/tutorial-5-cameracontrol/CMakeLists.txt rename to samples/android/tutorial-3-cameracontrol/CMakeLists.txt index 986f75402e..45c0af2c31 100644 --- a/samples/android/tutorial-5-cameracontrol/CMakeLists.txt +++ b/samples/android/tutorial-3-cameracontrol/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-5-cameracontrol) +set(sample example-tutorial-3-cameracontrol) add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) if(TARGET ${sample}) diff --git a/samples/android/tutorial-5-cameracontrol/res/drawable/icon.png b/samples/android/tutorial-3-cameracontrol/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-5-cameracontrol/res/drawable/icon.png rename to samples/android/tutorial-3-cameracontrol/res/drawable/icon.png diff --git a/samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml similarity index 86% rename from samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml rename to samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml index 36376e56bc..dde812543d 100644 --- a/samples/android/tutorial-5-cameracontrol/res/layout/tutorial5_surface_view.xml +++ b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml @@ -7,6 +7,6 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:visibility="gone" - android:id="@+id/tutorial5_activity_java_surface_view" /> + android:id="@+id/tutorial3_activity_java_surface_view" /> diff --git a/samples/android/tutorial-5-cameracontrol/res/values/strings.xml b/samples/android/tutorial-3-cameracontrol/res/values/strings.xml similarity index 52% rename from samples/android/tutorial-5-cameracontrol/res/values/strings.xml rename to samples/android/tutorial-3-cameracontrol/res/values/strings.xml index bf1a740ffb..d3fb56d945 100644 --- a/samples/android/tutorial-5-cameracontrol/res/values/strings.xml +++ b/samples/android/tutorial-3-cameracontrol/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T5 Camera Control + OCV T3 Camera Control diff --git a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java similarity index 95% rename from samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java index f19580b496..4c3a263ee0 100644 --- a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/Sample5CameraControl.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/Sample3CameraControl.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial5; +package org.opencv.samples.tutorial3; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,7 +28,7 @@ import android.view.View.OnTouchListener; import android.view.WindowManager; import android.widget.Toast; -public class Sample5CameraControl extends Activity implements CvCameraViewListener2, OnTouchListener { +public class Sample3CameraControl extends Activity implements CvCameraViewListener2, OnTouchListener { private static final String TAG = "OCVSample::Activity"; private SampleJavaCameraView mOpenCvCameraView; @@ -46,7 +46,7 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen { Log.i(TAG, "OpenCV loaded successfully"); mOpenCvCameraView.enableView(); - mOpenCvCameraView.setOnTouchListener(Sample5CameraControl.this); + mOpenCvCameraView.setOnTouchListener(Sample3CameraControl.this); } break; default: { @@ -56,7 +56,7 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen } }; - public Sample5CameraControl() { + public Sample3CameraControl() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -67,9 +67,9 @@ public class Sample5CameraControl extends Activity implements CvCameraViewListen super.onCreate(savedInstanceState); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - setContentView(R.layout.tutorial5_surface_view); + setContentView(R.layout.tutorial3_surface_view); - mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial5_activity_java_surface_view); + mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial3_activity_java_surface_view); mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE); diff --git a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java similarity index 98% rename from samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java index da12bb0982..38328a204d 100644 --- a/samples/android/tutorial-5-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial5/SampleJavaCameraView.java @@ -1,4 +1,4 @@ -package org.opencv.samples.tutorial5; +package org.opencv.samples.tutorial3; import java.io.FileOutputStream; import java.util.List;