From fb67186351e86b88c021829379f139fb8c70ef5e Mon Sep 17 00:00:00 2001
From: Ethan Rublee <no@email>
Date: Tue, 30 Nov 2010 01:19:45 +0000
Subject: [PATCH] editing the camerasettings text

---
 .../android-jni/res/layout/camerasettings.xml | 65 ++++++++-----------
 android/android-jni/res/values/strings.xml    |  3 +-
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/android/android-jni/res/layout/camerasettings.xml b/android/android-jni/res/layout/camerasettings.xml
index 42bbff0a9b..b6f1bd26ac 100644
--- a/android/android-jni/res/layout/camerasettings.xml
+++ b/android/android-jni/res/layout/camerasettings.xml
@@ -1,40 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:orientation="vertical"
-  android:gravity="center_vertical|center_horizontal">
-   <TextView android:text="@string/settings_text"  android:autoLink="web" android:layout_width="wrap_content" 
- android:layout_height="wrap_content" android:padding="20dip"/>
-  <LinearLayout android:id="@+id/LinearLayout01"
- android:layout_width="wrap_content" 
- android:layout_height="wrap_content"
- android:gravity="center_vertical">
- <TextView android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-   android:text="@string/image_size_prompt"/>
- <Spinner android:id="@+id/image_size" 
-  android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-         android:saveEnabled="true"
-           android:prompt="@string/image_size_prompt"
-android:entries="@array/image_sizes">
-</Spinner>
- </LinearLayout>
- 
- <LinearLayout android:id="@+id/LinearLayout01"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:gravity="center_vertical">
- <TextView android:layout_width="wrap_content"
- android:layout_height="wrap_content" android:text="@string/camera_mode_prompt"/>
- <Spinner android:id="@+id/camera_mode" 
-  android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:saveEnabled="true"
-        android:prompt="@string/camera_mode_prompt"
-android:entries="@array/camera_mode">
-</Spinner>
-</LinearLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical" android:gravity="center_vertical|center_horizontal">
+	<TextView android:text="@string/settings_text"
+		android:autoLink="web" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:padding="20dip" />
+		
+	<LinearLayout android:id="@+id/LinearLayout01"
+		android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:gravity="center_vertical">
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:text="@string/image_size_prompt" />
+		<Spinner android:id="@+id/image_size" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:saveEnabled="true"
+			android:prompt="@string/image_size_prompt" android:entries="@array/image_sizes">
+		</Spinner>
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/LinearLayout01"
+		android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:gravity="center_vertical">
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:text="@string/camera_mode_prompt" />
+		<Spinner android:id="@+id/camera_mode" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:saveEnabled="true"
+			android:prompt="@string/camera_mode_prompt" android:entries="@array/camera_mode">
+		</Spinner>
+	</LinearLayout>
 
 </LinearLayout>
diff --git a/android/android-jni/res/values/strings.xml b/android/android-jni/res/values/strings.xml
index fa623e2c27..541de3682b 100644
--- a/android/android-jni/res/values/strings.xml
+++ b/android/android-jni/res/values/strings.xml
@@ -8,7 +8,8 @@
 	
 	<string name="patternlink">http://opencv.willowgarage.com/pattern</string>
 	<string name="camera_settings_label">Camera Settings</string>
-	<string name="settings_text">Change the camera settings</string>
+	<string name="settings_text">Change the camera settings. Be aware that BW is much faster for previewing, than color. Also, if you change the image size, you should
+	rerun calibration.  Default values: BW and 640x480 are a good start.</string>
 	
 	<string name="calibration_service_started">Calibration calculations have started...</string>
 	<string name="calibration_service_stopped">Calibration calculations has stopped.</string>