Tutorial 1 renamed

pull/454/head
Alexander Smorkalov 12 years ago
parent 076941bb07
commit 33502c86ac
  1. 2
      samples/android/CMakeLists.txt
  2. 0
      samples/android/tutorial-1-camerapreview/.classpath
  3. 0
      samples/android/tutorial-1-camerapreview/.project
  4. 0
      samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs
  5. 0
      samples/android/tutorial-1-camerapreview/AndroidManifest.xml
  6. 2
      samples/android/tutorial-1-camerapreview/CMakeLists.txt
  7. 0
      samples/android/tutorial-1-camerapreview/res/drawable/icon.png
  8. 0
      samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml
  9. 2
      samples/android/tutorial-1-camerapreview/res/values/strings.xml
  10. 2
      samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java

@ -11,7 +11,7 @@ add_subdirectory(face-detection)
add_subdirectory(image-manipulations)
add_subdirectory(color-blob-detection)
add_subdirectory(tutorial-1-addopencv)
add_subdirectory(tutorial-1-camerapreview)
add_subdirectory(tutorial-2-opencvcamera)
add_subdirectory(tutorial-3-native)
add_subdirectory(tutorial-4-mixed)

@ -1,4 +1,4 @@
set(sample example-tutorial-1-addopencv)
set(sample example-tutorial-1-camerapreview)
add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
if(TARGET ${sample})

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">OCV T1 Add OpenCV</string>
<string name="app_name">OCV T1 Camera Preview</string>
</resources>

@ -88,7 +88,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
Log.i(TAG, "called onCreateOptionsMenu");
mItemSwitchCamera = menu.add("Switch camera");
mItemSwitchCamera = menu.add("Toggle Native/Java camera");
return true;
}
Loading…
Cancel
Save