From e95fc27490b9c51d87e208035154668ce7e76787 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Tue, 27 Nov 2012 11:57:01 +0400
Subject: [PATCH] Samples updated

In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
---
 .../res/layout/tutorial1_surface_view.xml                | 9 +++++++--
 .../opencv/samples/tutorial2/Sample2NativeCamera.java    | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml b/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml
index 844fcab00..52b9dfaf6 100644
--- a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml
+++ b/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml
@@ -1,5 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:opencv="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
@@ -7,12 +8,16 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:visibility="gone"
-        android:id="@+id/tutorial1_activity_java_surface_view" />
+        android:id="@+id/tutorial1_activity_java_surface_view"
+        opencv:show_fps="true"
+        opencv:camera_id="any" />
 
     <org.opencv.android.NativeCameraView
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:visibility="gone"
-        android:id="@+id/tutorial1_activity_native_surface_view" />
+        android:id="@+id/tutorial1_activity_native_surface_view"
+        opencv:show_fps="true"
+        opencv:camera_id="any" />
 
 </LinearLayout>
diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
index 009d00a8e..901e8dd1c 100644
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
@@ -110,7 +110,7 @@ public class Sample2NativeCamera extends Activity implements CvCameraViewListene
             case Sample2NativeCamera.VIEW_MODE_RGBA:
             {
                 inputFrame.copyTo(mRgba);
-                Core.putText(mRgba, "OpenCV+Android", new Point(10, 50), 3, 1, new Scalar(255, 0, 0, 255), 2);
+                Core.putText(mRgba, "OpenCV+Android", new Point(10, inputFrame.rows() - 10), 3, 1, new Scalar(255, 0, 0, 255), 2);
             } break;
             case Sample2NativeCamera.VIEW_MODE_CANNY:
             {