From 84856fa2c1d4a7c736e4fea7510e574054950b57 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Mon, 22 Oct 2012 17:15:51 +0400
Subject: [PATCH] CMakeLists.txt rescued. Androidmanifest unified.

---
 samples/android/15-puzzle/AndroidManifest.xml | 13 ++++++++-----
 samples/android/15-puzzle/CMakeLists.txt      |  6 ++++++
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 samples/android/15-puzzle/CMakeLists.txt

diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml
index d7ac6b1955..ad0e699ac3 100644
--- a/samples/android/15-puzzle/AndroidManifest.xml
+++ b/samples/android/15-puzzle/AndroidManifest.xml
@@ -3,10 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-permission android:name="android.permission.CAMERA" required="false"/>
-    <uses-feature android:name="android.hardware.camera" required="false"/>
-    <uses-feature android:name="android.hardware.camera.autofocus" required="false"/>
-
     <uses-sdk android:minSdkVersion="8"/>
 
     <application
@@ -16,7 +12,9 @@
         <activity
             android:name=".Puzzle15Activity"
             android:label="@string/app_name"
-             android:configChanges = "keyboardHidden|orientation" >
+            android:screenOrientation="landscape"
+            android:configChanges="keyboardHidden|orientation" >
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -25,4 +23,9 @@
         </activity>
     </application>
 
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
+
 </manifest>
\ No newline at end of file
diff --git a/samples/android/15-puzzle/CMakeLists.txt b/samples/android/15-puzzle/CMakeLists.txt
new file mode 100644
index 0000000000..4479319554
--- /dev/null
+++ b/samples/android/15-puzzle/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(sample example-15-puzzle)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+  add_dependencies(opencv_android_examples ${sample})
+endif()